From b3cbbd3ea8e05e1cd75b12e70d28ca1decc505d4 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 26 Aug 2010 14:32:57 +0100 Subject: [PATCH 001/235] Initial attempt, including full cached metadata, json serialization, and custom fields in save paths. Custom fields in collections probably work, but they haven't been tested. --- src/calibre/devices/apple/driver.py | 7 +- src/calibre/devices/interface.py | 4 +- src/calibre/devices/kobo/books.py | 21 +- src/calibre/devices/usbms/books.py | 43 +-- src/calibre/devices/usbms/driver.py | 21 +- src/calibre/ebooks/metadata/__init__.py | 216 +------------ src/calibre/ebooks/metadata/book/__init__.py | 41 ++- src/calibre/ebooks/metadata/book/base.py | 296 +++++++++++++++--- .../ebooks/metadata/book/json_codec.py | 125 ++++++++ src/calibre/ebooks/metadata/isbndb.py | 6 +- src/calibre/ebooks/metadata/opf2.py | 9 +- .../gui2/dialogs/config/save_template.py | 29 +- src/calibre/gui2/library/models.py | 3 +- src/calibre/library/database2.py | 31 +- src/calibre/library/save_to_disk.py | 19 +- 15 files changed, 514 insertions(+), 357 deletions(-) create mode 100644 src/calibre/ebooks/metadata/book/json_codec.py diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 916c88f203..75517e9df7 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -13,7 +13,8 @@ from calibre.devices.errors import UserFeedback from calibre.devices.usbms.deviceconfig import DeviceConfig from calibre.devices.interface import DevicePlugin from calibre.ebooks.BeautifulSoup import BeautifulSoup -from calibre.ebooks.metadata import MetaInformation, authors_to_string +from calibre.ebooks.metadata import authors_to_string +from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.epub import set_metadata from calibre.library.server.utils import strftime from calibre.utils.config import config_dir @@ -2998,14 +2999,14 @@ class BookList(list): ''' return {} -class Book(MetaInformation): +class Book(Metadata): ''' A simple class describing a book in the iTunes Books Library. - See ebooks.metadata.__init__ for all fields ''' def __init__(self,title,author): - MetaInformation.__init__(self, title, authors=[author]) + Metadata.__init__(self, title, authors=[author]) @dynamic_property def title_sorter(self): diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index 1384fa03d9..7783173c9c 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -316,7 +316,7 @@ class DevicePlugin(Plugin): being uploaded to the device. :param names: A list of file names that the books should have once uploaded to the device. len(names) == len(files) - :param metadata: If not None, it is a list of :class:`MetaInformation` objects. + :param metadata: If not None, it is a list of :class:`Metadata` objects. The idea is to use the metadata to determine where on the device to put the book. len(metadata) == len(files). Apart from the regular cover (path to cover), there may also be a thumbnail attribute, which should @@ -335,7 +335,7 @@ class DevicePlugin(Plugin): the device. :param locations: Result of a call to L{upload_books} - :param metadata: List of :class:`MetaInformation` objects, same as for + :param metadata: List of :class:`Metadata` objects, same as for :meth:`upload_books`. :param booklists: A tuple containing the result of calls to (:meth:`books(oncard=None)`, diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py index a5b2e98d2f..11ab42c29f 100644 --- a/src/calibre/devices/kobo/books.py +++ b/src/calibre/devices/kobo/books.py @@ -7,11 +7,11 @@ import os import re import time -from calibre.ebooks.metadata import MetaInformation +from calibre.ebooks.metadata.book.base import Metadata from calibre.constants import filesystem_encoding, preferred_encoding from calibre import isbytestring -class Book(MetaInformation): +class Book(Metadata): BOOK_ATTRS = ['lpath', 'size', 'mime', 'device_collections', '_new_book'] @@ -23,9 +23,9 @@ class Book(MetaInformation): 'uuid', ] - def __init__(self, prefix, lpath, title, authors, mime, date, ContentType, thumbnail_name, other=None): - - MetaInformation.__init__(self, '') + def __init__(self, prefix, lpath, title, authors, mime, date, ContentType, + thumbnail_name, other=None): + Metadata.__init__(self, '') self.device_collections = [] self._new_book = False @@ -34,7 +34,7 @@ class Book(MetaInformation): self.path = self.path.replace('/', '\\') self.lpath = lpath.replace('\\', '/') else: - self.lpath = lpath + self.lpath = lpath self.title = title if not authors: @@ -52,10 +52,9 @@ class Book(MetaInformation): else: self.datetime = time.gmtime(os.path.getctime(self.path)) except: - self.datetime = time.gmtime() - - if thumbnail_name is not None: - self.thumbnail = ImageWrapper(thumbnail_name) + self.datetime = time.gmtime() + if thumbnail_name is not None: + self.thumbnail = ImageWrapper(thumbnail_name) self.tags = [] if other: self.smart_update(other) @@ -90,7 +89,7 @@ class Book(MetaInformation): in C{other} takes precedence, unless the information in C{other} is NULL. ''' - MetaInformation.smart_update(self, other) + Metadata.smart_update(self, other) for attr in self.BOOK_ATTRS: if hasattr(other, attr): diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 959f26199c..e3c405ee4e 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -6,29 +6,18 @@ __docformat__ = 'restructuredtext en' import os, re, time, sys -from calibre.ebooks.metadata import MetaInformation +from calibre.ebooks.metadata.book.base import Metadata from calibre.devices.mime import mime_type_ext from calibre.devices.interface import BookList as _BookList from calibre.constants import filesystem_encoding, preferred_encoding from calibre import isbytestring from calibre.utils.config import prefs -class Book(MetaInformation): - - BOOK_ATTRS = ['lpath', 'size', 'mime', 'device_collections', '_new_book'] - - JSON_ATTRS = [ - 'lpath', 'title', 'authors', 'mime', 'size', 'tags', 'author_sort', - 'title_sort', 'comments', 'category', 'publisher', 'series', - 'series_index', 'rating', 'isbn', 'language', 'application_id', - 'book_producer', 'lccn', 'lcc', 'ddc', 'rights', 'publication_type', - 'uuid', - ] - +class Book(Metadata): def __init__(self, prefix, lpath, size=None, other=None): from calibre.ebooks.metadata.meta import path_to_ext - MetaInformation.__init__(self, '') + Metadata.__init__(self, '') self._new_book = False self.device_collections = [] @@ -72,32 +61,6 @@ class Book(MetaInformation): def thumbnail(self): return None - def smart_update(self, other, replace_metadata=False): - ''' - Merge the information in C{other} into self. In case of conflicts, the information - in C{other} takes precedence, unless the information in C{other} is NULL. - ''' - - MetaInformation.smart_update(self, other, replace_metadata) - - for attr in self.BOOK_ATTRS: - if hasattr(other, attr): - val = getattr(other, attr, None) - setattr(self, attr, val) - - def to_json(self): - json = {} - for attr in self.JSON_ATTRS: - val = getattr(self, attr) - if isbytestring(val): - enc = filesystem_encoding if attr == 'lpath' else preferred_encoding - val = val.decode(enc, 'replace') - elif isinstance(val, (list, tuple)): - val = [x.decode(preferred_encoding, 'replace') if - isbytestring(x) else x for x in val] - json[attr] = val - return json - class BookList(_BookList): def __init__(self, oncard, prefix, settings): diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index 0d28f06f49..a0d1d9dbf8 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -13,7 +13,6 @@ for a particular device. import os import re import time -import json from itertools import cycle from calibre import prints, isbytestring @@ -21,6 +20,7 @@ from calibre.constants import filesystem_encoding, DEBUG from calibre.devices.usbms.cli import CLI from calibre.devices.usbms.device import Device from calibre.devices.usbms.books import BookList, Book +from calibre.ebooks.metadata.book.json_codec import JsonCodec BASE_TIME = None def debug_print(*args): @@ -288,6 +288,7 @@ class USBMS(CLI, Device): # at the end just before the return def sync_booklists(self, booklists, end_session=True): debug_print('USBMS: starting sync_booklists') + json_codec = JsonCodec() if not os.path.exists(self.normalize_path(self._main_prefix)): os.makedirs(self.normalize_path(self._main_prefix)) @@ -296,10 +297,8 @@ class USBMS(CLI, Device): if prefix is not None and isinstance(booklists[listid], self.booklist_class): if not os.path.exists(prefix): os.makedirs(self.normalize_path(prefix)) - js = [item.to_json() for item in booklists[listid] if - hasattr(item, 'to_json')] with open(self.normalize_path(os.path.join(prefix, self.METADATA_CACHE)), 'wb') as f: - f.write(json.dumps(js, indent=2, encoding='utf-8')) + json_codec.encode_to_file(f, booklists[listid]) write_prefix(self._main_prefix, 0) write_prefix(self._card_a_prefix, 1) write_prefix(self._card_b_prefix, 2) @@ -345,19 +344,13 @@ class USBMS(CLI, Device): @classmethod def parse_metadata_cache(cls, bl, prefix, name): - # bl = cls.booklist_class() - js = [] + json_codec = JsonCodec() need_sync = False cache_file = cls.normalize_path(os.path.join(prefix, name)) if os.access(cache_file, os.R_OK): try: with open(cache_file, 'rb') as f: - js = json.load(f, encoding='utf-8') - for item in js: - book = cls.book_class(prefix, item.get('lpath', None)) - for key in item.keys(): - setattr(book, key, item[key]) - bl.append(book) + json_codec.decode_from_file(f, bl, cls.book_class, prefix) except: import traceback traceback.print_exc() @@ -392,7 +385,7 @@ class USBMS(CLI, Device): @classmethod def book_from_path(cls, prefix, lpath): - from calibre.ebooks.metadata import MetaInformation + from calibre.ebooks.metadata.book.base import Metadata if cls.settings().read_metadata or cls.MUST_READ_METADATA: mi = cls.metadata_from_path(cls.normalize_path(os.path.join(prefix, lpath))) @@ -401,7 +394,7 @@ class USBMS(CLI, Device): mi = metadata_from_filename(cls.normalize_path(os.path.basename(lpath)), cls.build_template_regexp()) if mi is None: - mi = MetaInformation(os.path.splitext(os.path.basename(lpath))[0], + mi = Metadata(os.path.splitext(os.path.basename(lpath))[0], [_('Unknown')]) size = os.stat(cls.normalize_path(os.path.join(prefix, lpath))).st_size book = cls.book_class(prefix, lpath, other=mi, size=size) diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py index d4a21e2c8c..fb894d3bbd 100644 --- a/src/calibre/ebooks/metadata/__init__.py +++ b/src/calibre/ebooks/metadata/__init__.py @@ -221,214 +221,18 @@ class ResourceCollection(object): -class MetaInformation(object): - '''Convenient encapsulation of book metadata''' - - @staticmethod - def copy(mi): - ans = MetaInformation(mi.title, mi.authors) - for attr in ('author_sort', 'title_sort', 'comments', 'category', - 'publisher', 'series', 'series_index', 'rating', - 'isbn', 'tags', 'cover_data', 'application_id', 'guide', - 'manifest', 'spine', 'toc', 'cover', 'language', - 'book_producer', 'timestamp', 'lccn', 'lcc', 'ddc', - 'author_sort_map', - 'pubdate', 'rights', 'publication_type', 'uuid'): - if hasattr(mi, attr): - setattr(ans, attr, getattr(mi, attr)) - - def __init__(self, title, authors=(_('Unknown'),)): - ''' +def MetaInformation(title, authors=(_('Unknown'),)): + ''' Convenient encapsulation of book metadata, needed for compatibility @param title: title or ``_('Unknown')`` or a MetaInformation object @param authors: List of strings or [] - ''' - mi = None - if hasattr(title, 'title') and hasattr(title, 'authors'): - mi = title - title = mi.title - authors = mi.authors - self.title = title - self.author = list(authors) if authors else []# Needed for backward compatibility - #: List of strings or [] - self.authors = list(authors) if authors else [] - self.tags = getattr(mi, 'tags', []) - #: mi.cover_data = (ext, data) - self.cover_data = getattr(mi, 'cover_data', (None, None)) - self.author_sort_map = getattr(mi, 'author_sort_map', {}) - - for x in ('author_sort', 'title_sort', 'comments', 'category', 'publisher', - 'series', 'series_index', 'rating', 'isbn', 'language', - 'application_id', 'manifest', 'toc', 'spine', 'guide', 'cover', - 'book_producer', 'timestamp', 'lccn', 'lcc', 'ddc', 'pubdate', - 'rights', 'publication_type', 'uuid', - ): - setattr(self, x, getattr(mi, x, None)) - - def print_all_attributes(self): - for x in ('title','author', 'author_sort', 'title_sort', 'comments', 'category', 'publisher', - 'series', 'series_index', 'tags', 'rating', 'isbn', 'language', - 'application_id', 'manifest', 'toc', 'spine', 'guide', 'cover', - 'book_producer', 'timestamp', 'lccn', 'lcc', 'ddc', 'pubdate', - 'rights', 'publication_type', 'uuid', 'author_sort_map' - ): - prints(x, getattr(self, x, 'None')) - - def smart_update(self, mi, replace_metadata=False): - ''' - Merge the information in C{mi} into self. In case of conflicts, the - information in C{mi} takes precedence, unless the information in mi is - NULL. If replace_metadata is True, then the information in mi always - takes precedence. - ''' - if mi.title and mi.title != _('Unknown'): - self.title = mi.title - - if mi.authors and mi.authors[0] != _('Unknown'): - self.authors = mi.authors - - for attr in ('author_sort', 'title_sort', 'category', - 'publisher', 'series', 'series_index', 'rating', - 'isbn', 'application_id', 'manifest', 'spine', 'toc', - 'cover', 'guide', 'book_producer', - 'timestamp', 'lccn', 'lcc', 'ddc', 'pubdate', 'rights', - 'publication_type', 'uuid'): - if replace_metadata: - setattr(self, attr, getattr(mi, attr, 1.0 if \ - attr == 'series_index' else None)) - elif hasattr(mi, attr): - val = getattr(mi, attr) - if val is not None: - setattr(self, attr, val) - - if replace_metadata: - self.tags = mi.tags - elif mi.tags: - self.tags += mi.tags - self.tags = list(set(self.tags)) - - if mi.author_sort_map: - self.author_sort_map.update(mi.author_sort_map) - - if getattr(mi, 'cover_data', False): - other_cover = mi.cover_data[-1] - self_cover = self.cover_data[-1] if self.cover_data else '' - if not self_cover: self_cover = '' - if not other_cover: other_cover = '' - if len(other_cover) > len(self_cover): - self.cover_data = mi.cover_data - - if replace_metadata: - self.comments = getattr(mi, 'comments', '') - else: - my_comments = getattr(self, 'comments', '') - other_comments = getattr(mi, 'comments', '') - if not my_comments: - my_comments = '' - if not other_comments: - other_comments = '' - if len(other_comments.strip()) > len(my_comments.strip()): - self.comments = other_comments - - other_lang = getattr(mi, 'language', None) - if other_lang and other_lang.lower() != 'und': - self.language = other_lang - - - def format_series_index(self): - try: - x = float(self.series_index) - except ValueError: - x = 1 - return fmt_sidx(x) - - def authors_from_string(self, raw): - self.authors = string_to_authors(raw) - - def format_authors(self): - return authors_to_string(self.authors) - - def format_tags(self): - return u', '.join([unicode(t) for t in self.tags]) - - def format_rating(self): - return unicode(self.rating) - - def __unicode__(self): - ans = [] - def fmt(x, y): - ans.append(u'%-20s: %s'%(unicode(x), unicode(y))) - - fmt('Title', self.title) - if self.title_sort: - fmt('Title sort', self.title_sort) - if self.authors: - fmt('Author(s)', authors_to_string(self.authors) + \ - ((' [' + self.author_sort + ']') if self.author_sort else '')) - if self.publisher: - fmt('Publisher', self.publisher) - if getattr(self, 'book_producer', False): - fmt('Book Producer', self.book_producer) - if self.category: - fmt('Category', self.category) - if self.comments: - fmt('Comments', self.comments) - if self.isbn: - fmt('ISBN', self.isbn) - if self.tags: - fmt('Tags', u', '.join([unicode(t) for t in self.tags])) - if self.series: - fmt('Series', self.series + ' #%s'%self.format_series_index()) - if self.language: - fmt('Language', self.language) - if self.rating is not None: - fmt('Rating', self.rating) - if self.timestamp is not None: - fmt('Timestamp', isoformat(self.timestamp)) - if self.pubdate is not None: - fmt('Published', isoformat(self.pubdate)) - if self.rights is not None: - fmt('Rights', unicode(self.rights)) - if self.lccn: - fmt('LCCN', unicode(self.lccn)) - if self.lcc: - fmt('LCC', unicode(self.lcc)) - if self.ddc: - fmt('DDC', unicode(self.ddc)) - - return u'\n'.join(ans) - - def to_html(self): - ans = [(_('Title'), unicode(self.title))] - ans += [(_('Author(s)'), (authors_to_string(self.authors) if self.authors else _('Unknown')))] - ans += [(_('Publisher'), unicode(self.publisher))] - ans += [(_('Producer'), unicode(self.book_producer))] - ans += [(_('Comments'), unicode(self.comments))] - ans += [('ISBN', unicode(self.isbn))] - if self.lccn: - ans += [('LCCN', unicode(self.lccn))] - if self.lcc: - ans += [('LCC', unicode(self.lcc))] - if self.ddc: - ans += [('DDC', unicode(self.ddc))] - ans += [(_('Tags'), u', '.join([unicode(t) for t in self.tags]))] - if self.series: - ans += [(_('Series'), unicode(self.series)+ ' #%s'%self.format_series_index())] - ans += [(_('Language'), unicode(self.language))] - if self.timestamp is not None: - ans += [(_('Timestamp'), unicode(self.timestamp.isoformat(' ')))] - if self.pubdate is not None: - ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] - if self.rights is not None: - ans += [(_('Rights'), unicode(self.rights))] - for i, x in enumerate(ans): - ans[i] = u'%s%s'%x - return u'%s
'%u'\n'.join(ans) - - def __str__(self): - return self.__unicode__().encode('utf-8') - - def __nonzero__(self): - return bool(self.title or self.author or self.comments or self.tags) + ''' + from calibre.ebooks.metadata.book.base import Metadata + mi = None + if hasattr(title, 'title') and hasattr(title, 'authors'): + mi = title + title = mi.title + authors = mi.authors + return Metadata(title, authors, mi) def check_isbn10(isbn): try: diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index c3b95f1188..9de7ca1c6b 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -24,6 +24,8 @@ SOCIAL_METADATA_FIELDS = frozenset([ # For example: {'isbn':'123456789', 'doi':'xxxx', ... } 'classifiers', 'isbn', # Pseudo field for convenience, should get/set isbn classifier + # TODO: not sure what this is, but it is used by OPF + 'category', ]) @@ -69,7 +71,8 @@ BOOK_STRUCTURE_FIELDS = frozenset([ ]) USER_METADATA_FIELDS = frozenset([ - # A dict of a form to be specified + # A dict of dicts similar to field_metadata. Each field description dict + # also contains a value field with the key #value#. 'user_metadata', ]) @@ -86,16 +89,42 @@ DEVICE_METADATA_FIELDS = frozenset([ CALIBRE_METADATA_FIELDS = frozenset([ # An application id # Semantics to be defined. Is it a db key? a db name + key? A uuid? + # (It is currently set to the db_id.) 'application_id', + # the calibre primary key of the item. May want to remove this once Sony's no longer use it + 'db_id', ] ) +ALL_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( + PUBLICATION_METADATA_FIELDS).union( + BOOK_STRUCTURE_FIELDS).union( + USER_METADATA_FIELDS).union( + DEVICE_METADATA_FIELDS).union( + CALIBRE_METADATA_FIELDS) -SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( - USER_METADATA_FIELDS).union( - PUBLICATION_METADATA_FIELDS).union( - CALIBRE_METADATA_FIELDS).union( - frozenset(['lpath'])) # I don't think we need device_collections +# All fields except custom fields +STANDARD_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( + PUBLICATION_METADATA_FIELDS).union( + BOOK_STRUCTURE_FIELDS).union( + DEVICE_METADATA_FIELDS).union( + CALIBRE_METADATA_FIELDS) + +# Metadata fields that smart update should copy without special handling +COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( + PUBLICATION_METADATA_FIELDS).union( + BOOK_STRUCTURE_FIELDS).union( + DEVICE_METADATA_FIELDS).union( + CALIBRE_METADATA_FIELDS) - \ + frozenset(['title', 'authors', 'comments', 'cover_data']) + +SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( + USER_METADATA_FIELDS).union( + PUBLICATION_METADATA_FIELDS).union( + CALIBRE_METADATA_FIELDS).union( + DEVICE_METADATA_FIELDS) - \ + frozenset(['device_collections']) + # I don't think we need device_collections # Serialization of covers/thumbnails will have to be handled carefully, maybe # as an option to the serializer class diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 3fed47091f..697de8d890 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -6,8 +6,13 @@ __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' import copy +import traceback + +from calibre import prints +from calibre.ebooks.metadata.book import COPYABLE_METADATA_FIELDS +from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS +from calibre.utils.date import isoformat -from calibre.ebooks.metadata.book import RESERVED_METADATA_FIELDS NULL_VALUES = { 'user_metadata': {}, @@ -24,98 +29,313 @@ NULL_VALUES = { class Metadata(object): ''' - This class must expose a superset of the API of MetaInformation in terms - of attribute access and methods. Only the __init__ method is different. - MetaInformation will simply become a function that creates and fills in - the attributes of this class. + A class representing all the metadata for a book. Please keep the method based API of this class to a minimum. Every method becomes a reserved field name. ''' - def __init__(self): + def __init__(self, title, authors=(_('Unknown'),), other=None): + ''' + @param title: title or ``_('Unknown')`` + @param authors: List of strings or [] + @param other: None or a metadata object + ''' object.__setattr__(self, '_data', copy.deepcopy(NULL_VALUES)) + if other is not None: + self.smart_update(other) + else: + if title: + self.title = title + if authors: + #: List of strings or [] + self.author = list(authors) if authors else []# Needed for backward compatibility + self.authors = list(authors) if authors else [] def __getattribute__(self, field): _data = object.__getattribute__(self, '_data') - if field in RESERVED_METADATA_FIELDS: + if field in STANDARD_METADATA_FIELDS: return _data.get(field, None) try: return object.__getattribute__(self, field) except AttributeError: pass if field in _data['user_metadata'].iterkeys(): - # TODO: getting user metadata values - pass + return _data['user_metadata'][field]['#value#'] raise AttributeError( 'Metadata object has no attribute named: '+ repr(field)) - def __setattr__(self, field, val): _data = object.__getattribute__(self, '_data') - if field in RESERVED_METADATA_FIELDS: - if field != 'user_metadata': - if not val: - val = NULL_VALUES[field] - _data[field] = val - else: - raise AttributeError('You cannot set user_metadata directly.') + if field in STANDARD_METADATA_FIELDS: + if not val: + val = NULL_VALUES.get(field, None) + _data[field] = val elif field in _data['user_metadata'].iterkeys(): - # TODO: Setting custom column values - pass + _data['user_metadata'][field]['#value#'] = val else: # You are allowed to stick arbitrary attributes onto this object as # long as they dont conflict with global or user metadata names # Don't abuse this privilege self.__dict__[field] = val + def get(self, field): + return self.__getattribute__(field) + + def set(self, field, val): + self.__setattr__(field, val) + @property - def user_metadata_names(self): + def user_metadata_keys(self): 'The set of user metadata names this object knows about' _data = object.__getattribute__(self, '_data') return frozenset(_data['user_metadata'].iterkeys()) - # Old MetaInformation API {{{ - def copy(self): - pass + @property + def all_user_metadata(self): + ''' + return a dict containing all the custom field metadata associated with + the book. Return a deep copy, just in case the user wants to change + values in the dict (json does). + ''' + _data = object.__getattribute__(self, '_data') + _data = _data['user_metadata'] + res = {} + for k in _data: + res[k] = copy.deepcopy(_data[k]) + return res + + def get_user_metadata(self, field): + ''' + return field metadata from the object if it is there. Otherwise return + None. field is the key name, not the label. Return a shallow copy, + just in case the user wants to change values in the dict (json does). + ''' + _data = object.__getattribute__(self, '_data') + _data = _data['user_metadata'] + if field in _data: + return copy.deepcopy(_data[field]) + return None + + def set_all_user_metadata(self, metadata): + ''' + store custom field metadata into the object. Field is the key name + not the label + ''' + if metadata is None: + traceback.print_stack() + else: + for key in metadata: + self.set_user_metadata(key, metadata[key]) + + def set_user_metadata(self, field, metadata): + ''' + store custom field metadata for one column into the object. Field is + the key name not the label + ''' + if field is not None: + if metadata is None: + traceback.print_stack() + metadata = copy.deepcopy(metadata) + if '#value#' not in metadata: + metadata['#value#'] = None + _data = object.__getattribute__(self, '_data') + _data['user_metadata'][field] = metadata + + @property + def all_attributes(self): + result = {} + _data = object.__getattribute__(self, '_data') + for attr in STANDARD_METADATA_FIELDS: + v = _data.get(attr, None) + if v is not None: + result[attr] = v + for attr in self.user_metadata_keys: + if self.get(attr) is not None: + result[attr] = self.get(attr) + return result + + # Old Metadata API {{{ + @staticmethod + def copy(mi): + ans = Metadata(mi.title, mi.authors) + for attr in STANDARD_METADATA_FIELDS: + if hasattr(mi, attr): + setattr(ans, attr, copy.deepcopy(getattr(mi, attr))) + for x in mi.user_metadata_keys: + meta = mi.get_user_metadata(x) + if meta is not None: + ans.set_user_metadata(x, meta) # get... did the deep copy def print_all_attributes(self): - pass + for x in STANDARD_METADATA_FIELDS: + prints('%s:'%x, getattr(self, x, 'None')) + for x in self.user_metadata_keys: + meta = self.get_user_metadata(x) + if meta is not None: + prints(x, meta) + prints('--------------') def smart_update(self, other, replace_metadata=False): - pass + ''' + Merge the information in C{other} into self. In case of conflicts, the information + in C{other} takes precedence, unless the information in other is NULL. + ''' + if other.title and other.title != _('Unknown'): + self.title = other.title + + if other.authors and other.authors[0] != _('Unknown'): + self.authors = other.authors + + for attr in COPYABLE_METADATA_FIELDS: + if replace_metadata: + setattr(self, attr, getattr(other, attr, 1.0 if \ + attr == 'series_index' else None)) + elif hasattr(other, attr): + val = getattr(other, attr) + if val is not None: + setattr(self, attr, copy.deepcopy(val)) + + if replace_metadata: + self.tags = other.tags + elif other.tags: + self.tags += other.tags + self.tags = list(set(self.tags)) + + if getattr(other, 'author_sort_map', None): + self.author_sort_map.update(other.author_sort_map) + + if getattr(other, 'cover_data', False): + other_cover = other.cover_data[-1] + self_cover = self.cover_data[-1] if self.cover_data else '' + if not self_cover: self_cover = '' + if not other_cover: other_cover = '' + if len(other_cover) > len(self_cover): + self.cover_data = other.cover_data + + if getattr(other, 'user_metadata_keys', None): + for x in other.user_metadata_keys: + meta = other.get_user_metadata(x) + if meta is not None or replace_metadata: + self.set_user_metadata(x, meta) # get... did the deepcopy + + if replace_metadata: + self.comments = getattr(other, 'comments', '') + else: + my_comments = getattr(self, 'comments', '') + other_comments = getattr(other, 'comments', '') + if not my_comments: + my_comments = '' + if not other_comments: + other_comments = '' + if len(other_comments.strip()) > len(my_comments.strip()): + self.comments = other_comments + + other_lang = getattr(other, 'language', None) + if other_lang and other_lang.lower() != 'und': + self.language = other_lang + def format_series_index(self): - pass + from calibre.ebooks.metadata import fmt_sidx + try: + x = float(self.series_index) + except ValueError: + x = 1 + return fmt_sidx(x) def authors_from_string(self, raw): - pass + from calibre.ebooks.metadata import string_to_authors + self.authors = string_to_authors(raw) def format_authors(self): - pass + from calibre.ebooks.metadata import authors_to_string + return authors_to_string(self.authors) def format_tags(self): - pass + return u', '.join([unicode(t) for t in self.tags]) def format_rating(self): return unicode(self.rating) def __unicode__(self): - pass + from calibre.ebooks.metadata import authors_to_string + ans = [] + def fmt(x, y): + ans.append(u'%-20s: %s'%(unicode(x), unicode(y))) + + fmt('Title', self.title) + if self.title_sort: + fmt('Title sort', self.title_sort) + if self.authors: + fmt('Author(s)', authors_to_string(self.authors) + \ + ((' [' + self.author_sort + ']') if self.author_sort else '')) + if self.publisher: + fmt('Publisher', self.publisher) + if getattr(self, 'book_producer', False): + fmt('Book Producer', self.book_producer) + if self.category: + fmt('Category', self.category) + if self.comments: + fmt('Comments', self.comments) + if self.isbn: + fmt('ISBN', self.isbn) + if self.tags: + fmt('Tags', u', '.join([unicode(t) for t in self.tags])) + if self.series: + fmt('Series', self.series + ' #%s'%self.format_series_index()) + if self.language: + fmt('Language', self.language) + if self.rating is not None: + fmt('Rating', self.rating) + if self.timestamp is not None: + fmt('Timestamp', isoformat(self.timestamp)) + if self.pubdate is not None: + fmt('Published', isoformat(self.pubdate)) + if self.rights is not None: + fmt('Rights', unicode(self.rights)) + if self.lccn: + fmt('LCCN', unicode(self.lccn)) + if self.lcc: + fmt('LCC', unicode(self.lcc)) + if self.ddc: + fmt('DDC', unicode(self.ddc)) + # CUSTFIELD: What to do about custom fields? + return u'\n'.join(ans) def to_html(self): - pass + from calibre.ebooks.metadata import authors_to_string + ans = [(_('Title'), unicode(self.title))] + ans += [(_('Author(s)'), (authors_to_string(self.authors) if self.authors else _('Unknown')))] + ans += [(_('Publisher'), unicode(self.publisher))] + ans += [(_('Producer'), unicode(self.book_producer))] + ans += [(_('Comments'), unicode(self.comments))] + ans += [('ISBN', unicode(self.isbn))] + if self.lccn: + ans += [('LCCN', unicode(self.lccn))] + if self.lcc: + ans += [('LCC', unicode(self.lcc))] + if self.ddc: + ans += [('DDC', unicode(self.ddc))] + ans += [(_('Tags'), u', '.join([unicode(t) for t in self.tags]))] + if self.series: + ans += [(_('Series'), unicode(self.series)+ ' #%s'%self.format_series_index())] + ans += [(_('Language'), unicode(self.language))] + if self.timestamp is not None: + ans += [(_('Timestamp'), unicode(self.timestamp.isoformat(' ')))] + if self.pubdate is not None: + ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] + if self.rights is not None: + ans += [(_('Rights'), unicode(self.rights))] + for i, x in enumerate(ans): + ans[i] = u'%s%s'%x + # CUSTFIELD: What to do about custom fields + return u'%s
'%u'\n'.join(ans) def __str__(self): return self.__unicode__().encode('utf-8') def __nonzero__(self): - return True + return bool(self.title or self.author or self.comments or self.tags) # }}} - -# We don't need reserved field names for this object any more. Lets just use a -# protocol like the last char of a user field label should be _ when using this -# object -# So mi.tags returns the builtin tags and mi.tags_ returns the user tags - diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py new file mode 100644 index 0000000000..5e13650f0e --- /dev/null +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -0,0 +1,125 @@ +''' +Created on 4 Jun 2010 + +@author: charles +''' + +from base64 import b64encode, b64decode +import json +import traceback +from PIL import Image + +from . import SERIALIZABLE_FIELDS +from calibre.constants import filesystem_encoding, preferred_encoding +from calibre.library.field_metadata import FieldMetadata +from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE + +# Translate datetimes to and from strings. The string form is the datetime in +# UTC. The returned date is also UTC +def string_to_datetime(src): + if src == "None": + return None +# dt = strptime(src, '%d %m %Y %H:%M:%S', assume_utc=True, as_utc=True) +# if dt == UNDEFINED_DATE: +# return None + return parse_date(src) + +def datetime_to_string(dateval): + if dateval is None or dateval == UNDEFINED_DATE: + return "None" +# tt = date_to_utc(dateval).timetuple() +# res = "%02d %02d %04d %02d:%02d:%02d"%(tt.tm_mday, tt.tm_mon, tt.tm_year, +# tt.tm_hour, tt.tm_min, tt.tm_sec) + return isoformat(dateval) + +def encode_thumbnail(thumbnail): + ''' + Encode the image part of a thumbnail, then return the 3 part tuple + ''' + if thumbnail is None: + return None + return (thumbnail[0], thumbnail[1], b64encode(str(thumbnail[2]))) + +def decode_thumbnail(tup): + ''' + Decode an encoded thumbnail into its 3 component parts + ''' + if tup is None: + return None + return (tup[0], tup[1], b64decode(tup[2])) + +class JsonCodec(object): + + def __init__(self): + self.field_metadata = FieldMetadata() + + def encode_to_file(self, file, booklist): + json.dump(self.encode_booklist_metadata(booklist), file, indent=2, encoding='utf-8') + + def encode_booklist_metadata(self, booklist): + result = [] + for book in booklist: + result.append(self.encode_book_metadata(book)) + return result + + def encode_book_metadata(self, book): + result = {} + for key in SERIALIZABLE_FIELDS: + result[key] = self.encode_metadata_attr(book, key) + return result + + def encode_metadata_attr(self, book, key): + if key == 'user_metadata': + meta = book.all_user_metadata + for k in meta: + if meta[k]['datatype'] == 'datetime': + meta[k]['#value#'] = datetime_to_string(meta[k]['#value#']) + return meta + if key in self.field_metadata: + datatype = self.field_metadata[key]['datatype'] + else: + datatype = None + value = book.get(key) + if key == 'thumbnail': + return encode_thumbnail(value) + elif isinstance(value, str): # str includes bytes + enc = filesystem_encoding if key == 'lpath' else preferred_encoding + return value.decode(enc, 'replace') + elif isinstance(value, (list, tuple)): + return [x.decode(preferred_encoding, 'replace') if + isinstance(x, str) else x for x in value] + elif datatype == 'datetime': + return datetime_to_string(value) + else: + return value + + def decode_from_file(self, file, booklist, book_class, prefix): + js = [] + try: + js = json.load(file, encoding='utf-8') + for item in js: + book = book_class(prefix, item.get('lpath', None)) + for key in item.keys(): + meta = self.decode_metadata(key, item[key]) + if key == 'user_metadata': + book.set_all_user_metadata(meta) + else: + setattr(book, key, meta) + booklist.append(book) + except: + print 'exception during JSON decoding' + traceback.print_exc() + booklist = [] + + def decode_metadata(self, key, value): + if key == 'user_metadata': + for k in value: + if value[k]['datatype'] == 'datetime': + value[k]['#value#'] = string_to_datetime(value[k]['#value#']) + return value + elif key in self.field_metadata: + if self.field_metadata[key]['datatype'] == 'datetime': + return string_to_datetime(value) + if key == 'thumbnail': + return decode_thumbnail(value) + return value diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py index 356cc3f1b1..b5fc5830c8 100644 --- a/src/calibre/ebooks/metadata/isbndb.py +++ b/src/calibre/ebooks/metadata/isbndb.py @@ -8,7 +8,7 @@ import sys, re from urllib import quote from calibre.utils.config import OptionParser -from calibre.ebooks.metadata import MetaInformation +from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup from calibre import browser @@ -42,10 +42,10 @@ def fetch_metadata(url, max=100, timeout=5.): return books -class ISBNDBMetadata(MetaInformation): +class ISBNDBMetadata(Metadata): def __init__(self, book): - MetaInformation.__init__(self, None, []) + Metadata.__init__(self, None, []) self.isbn = book.get('isbn13', book.get('isbn')) self.title = book.find('titlelong').string diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index f93b614ef2..0ab6d3bbc0 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -16,7 +16,8 @@ from lxml import etree from calibre.ebooks.chardet import xml_to_unicode from calibre.constants import __appname__, __version__, filesystem_encoding from calibre.ebooks.metadata.toc import TOC -from calibre.ebooks.metadata import MetaInformation, string_to_authors +from calibre.ebooks.metadata import string_to_authors +from calibre.ebooks.metadata.book.base import Metadata from calibre.utils.date import parse_date, isoformat from calibre.utils.localization import get_lang @@ -926,16 +927,16 @@ class OPF(object): setattr(self, attr, val) -class OPFCreator(MetaInformation): +class OPFCreator(Metadata): - def __init__(self, base_path, *args, **kwargs): + def __init__(self, base_path, other): ''' Initialize. @param base_path: An absolute path to the directory in which this OPF file will eventually be. This is used by the L{create_manifest} method to convert paths to files into relative paths. ''' - MetaInformation.__init__(self, *args, **kwargs) + Metadata.__init__(self, title='', other=other) self.base_path = os.path.abspath(base_path) if self.application_id is None: self.application_id = str(uuid.uuid4()) diff --git a/src/calibre/gui2/dialogs/config/save_template.py b/src/calibre/gui2/dialogs/config/save_template.py index 71eb15f4aa..2157d5b3bf 100644 --- a/src/calibre/gui2/dialogs/config/save_template.py +++ b/src/calibre/gui2/dialogs/config/save_template.py @@ -34,25 +34,24 @@ class SaveTemplate(QWidget, Ui_Form): self.option_name = name def validate(self): - tmpl = preprocess_template(self.opt_template.text()) - fa = {} - for x in FORMAT_ARG_DESCS.keys(): - fa[x]='random long string' - try: - tmpl.format(**fa) - except Exception, err: - error_dialog(self, _('Invalid template'), - '

'+_('The template %s is invalid:')%tmpl + \ - '
'+str(err), show=True) - return False + # TODO: I haven't figured out how to get the custom columns into here, + # so for the moment make all templates valid. return True +# tmpl = preprocess_template(self.opt_template.text()) +# fa = {} +# for x in FORMAT_ARG_DESCS.keys(): +# fa[x]='random long string' +# try: +# tmpl.format(**fa) +# except Exception, err: +# error_dialog(self, _('Invalid template'), +# '

'+_('The template %s is invalid:')%tmpl + \ +# '
'+str(err), show=True) +# return False +# return True def save_settings(self, config, name): val = unicode(self.opt_template.text()) config.set(name, val) self.opt_template.save_history(self.option_name+'_template_history') - - - - diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 89008735fe..fdf21ecc23 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -372,7 +372,6 @@ class BooksModel(QAbstractTableModel): # {{{ return ans def get_metadata(self, rows, rows_are_ids=False, full_metadata=False): - # Should this add the custom columns? It doesn't at the moment metadata, _full_metadata = [], [] if not rows_are_ids: rows = [self.db.id(row.row()) for row in rows] @@ -1053,7 +1052,7 @@ class DeviceBooksModel(BooksModel): # {{{ if hasattr(cdata, 'image_path'): img.load(cdata.image_path) else: - img.loadFromData(cdata) + img.loadFromData(cdata[2]) if img.isNull(): img = self.default_image data['cover'] = img diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index ef74188bdf..9f21fe0eda 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -509,15 +509,15 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): ''' Convenience method to return metadata as a L{MetaInformation} object. ''' - aum = self.authors(idx, index_is_id=index_is_id) - if aum: aum = [a.strip().replace('|', ',') for a in aum.split(',')] + aut_list = self.authors_with_sort_strings(idx, index_is_id=index_is_id) + aum = [] + aus = {} + for (author, author_sort) in aut_list: + aum.append(author) + aus[author] = author_sort mi = MetaInformation(self.title(idx, index_is_id=index_is_id), aum) mi.author_sort = self.author_sort(idx, index_is_id=index_is_id) - if mi.authors: - mi.author_sort_map = {} - for name, sort in zip(mi.authors, self.authors_sort_strings(idx, - index_is_id)): - mi.author_sort_map[name] = sort + mi.author_sort_map = aus mi.comments = self.comments(idx, index_is_id=index_is_id) mi.publisher = self.publisher(idx, index_is_id=index_is_id) mi.timestamp = self.timestamp(idx, index_is_id=index_is_id) @@ -534,6 +534,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.isbn = self.isbn(idx, index_is_id=index_is_id) id = idx if index_is_id else self.id(idx) mi.application_id = id + for key,meta in self.field_metadata.iteritems(): + if meta['is_custom']: + mi.set_user_metadata(key, meta) + mi.set(key, self.get_custom(idx, label=meta['label'], index_is_id=index_is_id)) if get_cover: mi.cover = self.cover(id, index_is_id=True, as_path=True) return mi @@ -1049,6 +1053,19 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): result.append(sort) return result + # Given a book, return the map of author sort strings for the book's authors + def authors_with_sort_strings(self, id, index_is_id=False): + id = id if index_is_id else self.id(id) + aut_strings = self.conn.get(''' + SELECT authors.name, authors.sort + FROM authors, books_authors_link as bl + WHERE bl.book=? and authors.id=bl.author + ORDER BY bl.id''', (id,)) + result = [] + for (author, sort,) in aut_strings: + result.append((author.replace('|', ','), sort)) + return result + # Given a book, return the author_sort string for authors of the book def author_sort_from_book(self, id, index_is_id=False): auts = self.authors_sort_strings(id, index_is_id) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 15020855f7..258ea7ba9e 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -105,6 +105,8 @@ def safe_format(x, format_args): pass except AttributeError: # Thrown if user used a non existing attribute pass + except KeyError: # Thrown if user used custom field w/value None + pass return '' def get_components(template, mi, id, timefmt='%b %Y', length=250, @@ -113,13 +115,12 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, library_order = tweaks['save_template_title_series_sorting'] == 'library_order' tsfmt = title_sort if library_order else lambda x: x format_args = dict(**FORMAT_ARGS) + format_args.update(mi.all_attributes) if mi.title: format_args['title'] = tsfmt(mi.title) if mi.authors: format_args['authors'] = mi.format_authors() format_args['author'] = format_args['authors'] - if mi.author_sort: - format_args['author_sort'] = mi.author_sort if mi.tags: format_args['tags'] = mi.format_tags() if format_args['tags'].startswith('/'): @@ -132,15 +133,21 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, template = re.sub(r'\{series_index[^}]*?\}', '', template) if mi.rating is not None: format_args['rating'] = mi.format_rating() - if mi.isbn: - format_args['isbn'] = mi.isbn - if mi.publisher: - format_args['publisher'] = mi.publisher if hasattr(mi.timestamp, 'timetuple'): format_args['timestamp'] = strftime(timefmt, mi.timestamp.timetuple()) if hasattr(mi.pubdate, 'timetuple'): format_args['pubdate'] = strftime(timefmt, mi.pubdate.timetuple()) format_args['id'] = str(id) + + # These are not necessary any more. The values are set by + # 'format_args.update' above, and there is no special formatting +# if mi.author_sort: +# format_args['author_sort'] = mi.author_sort +# if mi.isbn: +# format_args['isbn'] = mi.isbn +# if mi.publisher: +# format_args['publisher'] = mi.publisher + components = [x.strip() for x in template.split('/') if x.strip()] components = [safe_format(x, format_args) for x in components] components = [sanitize_func(x) for x in components if x] From b04faf70c2378c3569a4d1cf010da3d57a707c42 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 27 Aug 2010 08:22:08 +0100 Subject: [PATCH 002/235] Make Kobo driver use new metadata framework --- src/calibre/devices/kobo/books.py | 80 ++---------------------------- src/calibre/devices/kobo/driver.py | 2 +- 2 files changed, 5 insertions(+), 77 deletions(-) diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py index f0cf7c3763..1c3d05ea12 100644 --- a/src/calibre/devices/kobo/books.py +++ b/src/calibre/devices/kobo/books.py @@ -4,37 +4,15 @@ __copyright__ = '2010, Timothy Legge ' ''' import os -import re import time -from calibre.ebooks.metadata.book.base import Metadata -from calibre.constants import filesystem_encoding, preferred_encoding -from calibre import isbytestring +from calibre.devices.usbms.books import Book as Book_ -class Book(Metadata): - - BOOK_ATTRS = ['lpath', 'size', 'mime', 'device_collections', '_new_book'] - - JSON_ATTRS = [ - 'lpath', 'title', 'authors', 'mime', 'size', 'tags', 'author_sort', - 'title_sort', 'comments', 'category', 'publisher', 'series', - 'series_index', 'rating', 'isbn', 'language', 'application_id', - 'book_producer', 'lccn', 'lcc', 'ddc', 'rights', 'publication_type', - 'uuid', 'device_collections', - ] +class Book(Book_): def __init__(self, prefix, lpath, title, authors, mime, date, ContentType, thumbnail_name, other=None): - Metadata.__init__(self, '') - self.device_collections = [] - self._new_book = False - - self.path = os.path.join(prefix, lpath) - if os.sep == '\\': - self.path = self.path.replace('/', '\\') - self.lpath = lpath.replace('\\', '/') - else: - self.lpath = lpath + Book_.__init__(self, prefix, lpath) self.title = title if not authors: @@ -59,57 +37,7 @@ class Book(Metadata): if other: self.smart_update(other) - def __eq__(self, other): - return self.path == getattr(other, 'path', None) - - @dynamic_property - def db_id(self): - doc = '''The database id in the application database that this file corresponds to''' - def fget(self): - match = re.search(r'_(\d+)$', self.lpath.rpartition('.')[0]) - if match: - return int(match.group(1)) - return None - return property(fget=fget, doc=doc) - - @dynamic_property - def title_sorter(self): - doc = '''String to sort the title. If absent, title is returned''' - def fget(self): - return re.sub('^\s*A\s+|^\s*The\s+|^\s*An\s+', '', self.title).rstrip() - return property(doc=doc, fget=fget) - - @dynamic_property - def thumbnail(self): - return None - - def smart_update(self, other, replace_metadata=False): - ''' - Merge the information in C{other} into self. In case of conflicts, the information - in C{other} takes precedence, unless the information in C{other} is NULL. - ''' - - Metadata.smart_update(self, other) - - for attr in self.BOOK_ATTRS: - if hasattr(other, attr): - val = getattr(other, attr, None) - setattr(self, attr, val) - - def to_json(self): - json = {} - for attr in self.JSON_ATTRS: - val = getattr(self, attr) - if isbytestring(val): - enc = filesystem_encoding if attr == 'lpath' else preferred_encoding - val = val.decode(enc, 'replace') - elif isinstance(val, (list, tuple)): - val = [x.decode(preferred_encoding, 'replace') if - isbytestring(x) else x for x in val] - json[attr] = val - return json - class ImageWrapper(object): def __init__(self, image_path): - self.image_path = image_path + self.image_path = image_path diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 35fceb80f7..5f939a4498 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -132,7 +132,7 @@ class KOBO(USBMS): changed = False for i, row in enumerate(cursor): - # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...')) + # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...')) path = self.path_from_contentid(row[3], row[5], oncard) mime = mime_type_ext(path_to_ext(row[3])) From 47fedcee36db9d7f9f5ab39460a6eafcbe21df20 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 27 Aug 2010 10:26:36 +0100 Subject: [PATCH 003/235] Bug fixes: 1) Only reset to initial values when None is assigned. Using 'if not var' is true for empty lists 2) Take unused values out of the to_html and unicode functions 3) add 'language' as a valid metadata field --- src/calibre/ebooks/metadata/book/__init__.py | 68 +++++++------------- src/calibre/ebooks/metadata/book/base.py | 31 +++++---- 2 files changed, 42 insertions(+), 57 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index 9de7ca1c6b..b1a322b143 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -11,50 +11,39 @@ an empty list/dictionary for complex types and (None, None) for cover_data ''' SOCIAL_METADATA_FIELDS = frozenset([ - 'tags', # Ordered list - # A floating point number between 0 and 10 - 'rating', - # A simple HTML enabled string - 'comments', - # A simple string - 'series', - # A floating point number - 'series_index', + 'tags', # Ordered list + 'rating', # A floating point number between 0 and 10 + 'comments', # A simple HTML enabled string + 'series', # A simple string + 'series_index', # A floating point number # Of the form { scheme1:value1, scheme2:value2} # For example: {'isbn':'123456789', 'doi':'xxxx', ... } 'classifiers', - 'isbn', # Pseudo field for convenience, should get/set isbn classifier - # TODO: not sure what this is, but it is used by OPF - 'category', - + 'isbn', # Pseudo field for convenience, should get/set isbn classifier + 'category', # TODO: not sure what this is, but it is used by OPF ]) PUBLICATION_METADATA_FIELDS = frozenset([ - # title must never be None. Should be _('Unknown') - 'title', + 'title', # title must never be None. Should be _('Unknown') # Pseudo field that can be set, but if not set is auto generated # from title and languages 'title_sort', - # Ordered list of authors. Must never be None, can be [_('Unknown')] - 'authors', - # Map of sort strings for each author - 'author_sort_map', + 'authors', # Ordered list. Must never be None, can be [_('Unknown')] + 'author_sort_map', # Map of sort strings for each author # Pseudo field that can be set, but if not set is auto generated # from authors and languages 'author_sort', 'book_producer', - # Dates and times must be timezone aware - 'timestamp', + 'timestamp', # Dates and times must be timezone aware 'pubdate', 'rights', # So far only known publication type is periodical:calibre # If None, means book 'publication_type', - # A UUID usually of type 4 - 'uuid', - 'languages', # ordered list - # Simple string, no special semantics - 'publisher', + 'uuid', # A UUID usually of type 4 + 'language', # the primary language of this book + 'languages', # ordered list + 'publisher', # Simple string, no special semantics # Absolute path to image file encoded in filesystem_encoding 'cover', # Of the form (format, data) where format is, for e.g. 'jpeg', 'png', 'gif'... @@ -77,22 +66,18 @@ USER_METADATA_FIELDS = frozenset([ ]) DEVICE_METADATA_FIELDS = frozenset([ - # Ordered list of strings - 'device_collections', - 'lpath', # Unicode, / separated - # In bytes - 'size', - # Mimetype of the book file being represented - 'mime', + 'device_collections', # Ordered list of strings + 'lpath', # Unicode, / separated + 'size', # In bytes + 'mime', # Mimetype of the book file being represented + ]) CALIBRE_METADATA_FIELDS = frozenset([ - # An application id - # Semantics to be defined. Is it a db key? a db name + key? A uuid? - # (It is currently set to the db_id.) - 'application_id', - # the calibre primary key of the item. May want to remove this once Sony's no longer use it - 'db_id', + 'application_id', # An application id, currently set to the db_id. + # the calibre primary key of the item. + 'db_id', # the calibre primary key of the item. + # TODO: May want to remove once Sony's no longer use it ] ) @@ -124,7 +109,4 @@ SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( CALIBRE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS) - \ frozenset(['device_collections']) - # I don't think we need device_collections - -# Serialization of covers/thumbnails will have to be handled carefully, maybe -# as an option to the serializer class + # device_collections is rebuilt when needed diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 697de8d890..e352aecbf8 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -24,6 +24,7 @@ NULL_VALUES = { 'author_sort_map': {}, 'authors' : [_('Unknown')], 'title' : _('Unknown'), + 'language' : 'und' } class Metadata(object): @@ -68,14 +69,14 @@ class Metadata(object): def __setattr__(self, field, val): _data = object.__getattribute__(self, '_data') if field in STANDARD_METADATA_FIELDS: - if not val: + if val is None: val = NULL_VALUES.get(field, None) _data[field] = val elif field in _data['user_metadata'].iterkeys(): _data['user_metadata'][field]['#value#'] = val else: # You are allowed to stick arbitrary attributes onto this object as - # long as they dont conflict with global or user metadata names + # long as they don't conflict with global or user metadata names # Don't abuse this privilege self.__dict__[field] = val @@ -294,12 +295,13 @@ class Metadata(object): fmt('Published', isoformat(self.pubdate)) if self.rights is not None: fmt('Rights', unicode(self.rights)) - if self.lccn: - fmt('LCCN', unicode(self.lccn)) - if self.lcc: - fmt('LCC', unicode(self.lcc)) - if self.ddc: - fmt('DDC', unicode(self.ddc)) +# TODO: These are not in metadata. Should they be? +# if self.lccn: +# fmt('LCCN', unicode(self.lccn)) +# if self.lcc: +# fmt('LCC', unicode(self.lcc)) +# if self.ddc: +# fmt('DDC', unicode(self.ddc)) # CUSTFIELD: What to do about custom fields? return u'\n'.join(ans) @@ -311,12 +313,13 @@ class Metadata(object): ans += [(_('Producer'), unicode(self.book_producer))] ans += [(_('Comments'), unicode(self.comments))] ans += [('ISBN', unicode(self.isbn))] - if self.lccn: - ans += [('LCCN', unicode(self.lccn))] - if self.lcc: - ans += [('LCC', unicode(self.lcc))] - if self.ddc: - ans += [('DDC', unicode(self.ddc))] +# TODO: These are not in metadata. Should they be? +# if self.lccn: +# ans += [('LCCN', unicode(self.lccn))] +# if self.lcc: +# ans += [('LCC', unicode(self.lcc))] +# if self.ddc: +# ans += [('DDC', unicode(self.ddc))] ans += [(_('Tags'), u', '.join([unicode(t) for t in self.tags]))] if self.series: ans += [(_('Series'), unicode(self.series)+ ' #%s'%self.format_series_index())] From b4b0cb483df4a647de50145abf88a7b26ecd79c9 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 28 Aug 2010 13:34:49 +0100 Subject: [PATCH 004/235] Changes to respond to Kovid's mail, and some cleanups. --- src/calibre/ebooks/metadata/book/__init__.py | 4 +- src/calibre/ebooks/metadata/book/base.py | 132 +++++++++++------- .../ebooks/metadata/book/json_codec.py | 2 +- src/calibre/library/database2.py | 15 +- src/calibre/library/save_to_disk.py | 13 +- 5 files changed, 100 insertions(+), 66 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index b1a322b143..fbcca79aba 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -101,7 +101,9 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( BOOK_STRUCTURE_FIELDS).union( DEVICE_METADATA_FIELDS).union( CALIBRE_METADATA_FIELDS) - \ - frozenset(['title', 'authors', 'comments', 'cover_data']) + frozenset(['title', 'title_sort', 'authors', + 'author_sort', 'author_sort_map' 'comments', + 'cover_data', 'tags', 'language']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index e352aecbf8..a81ce46c34 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -66,7 +66,7 @@ class Metadata(object): raise AttributeError( 'Metadata object has no attribute named: '+ repr(field)) - def __setattr__(self, field, val): + def __setattr__(self, field, val, extra=None): _data = object.__getattribute__(self, '_data') if field in STANDARD_METADATA_FIELDS: if val is None: @@ -74,17 +74,23 @@ class Metadata(object): _data[field] = val elif field in _data['user_metadata'].iterkeys(): _data['user_metadata'][field]['#value#'] = val + _data['user_metadata'][field]['#extra#'] = extra else: # You are allowed to stick arbitrary attributes onto this object as # long as they don't conflict with global or user metadata names # Don't abuse this privilege self.__dict__[field] = val - def get(self, field): + def get(self, field, default=None): + if default is not None: + try: + return self.__getattribute__(field) + except AttributeError: + return default return self.__getattribute__(field) - def set(self, field, val): - self.__setattr__(field, val) + def set(self, field, val, extra=None): + self.__setattr__(field, val, extra) @property def user_metadata_keys(self): @@ -92,25 +98,25 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') return frozenset(_data['user_metadata'].iterkeys()) - @property - def all_user_metadata(self): + def get_all_user_metadata(self, make_copy): ''' return a dict containing all the custom field metadata associated with - the book. Return a deep copy, just in case the user wants to change - values in the dict (json does). + the book. ''' _data = object.__getattribute__(self, '_data') - _data = _data['user_metadata'] + user_metadata = _data['user_metadata'] + if not make_copy: + return user_metadata res = {} - for k in _data: - res[k] = copy.deepcopy(_data[k]) + for k in user_metadata: + res[k] = copy.deepcopy(user_metadata[k]) return res def get_user_metadata(self, field): ''' return field metadata from the object if it is there. Otherwise return - None. field is the key name, not the label. Return a shallow copy, - just in case the user wants to change values in the dict (json does). + None. field is the key name, not the label. Return a copy, just in case + the user wants to change values in the dict (json does). ''' _data = object.__getattribute__(self, '_data') _data = _data['user_metadata'] @@ -118,6 +124,14 @@ class Metadata(object): return copy.deepcopy(_data[field]) return None + @classmethod + def get_user_metadata_value(user_mi): + return user_mi['#value#'] + + @classmethod + def get_user_metadata_extra(user_mi): + return user_mi['#extra#'] + def set_all_user_metadata(self, metadata): ''' store custom field metadata into the object. Field is the key name @@ -139,21 +153,30 @@ class Metadata(object): traceback.print_stack() metadata = copy.deepcopy(metadata) if '#value#' not in metadata: - metadata['#value#'] = None + if metadata['datatype'] == 'text' and metadata['is_multiple']: + metadata['#value#'] = [] + else: + metadata['#value#'] = None _data = object.__getattribute__(self, '_data') _data['user_metadata'][field] = metadata - @property - def all_attributes(self): + def get_all_non_none_attributes(self): + ''' + Return a dictionary containing all non-None metadata fields, including + the custom ones. + ''' result = {} _data = object.__getattribute__(self, '_data') for attr in STANDARD_METADATA_FIELDS: v = _data.get(attr, None) if v is not None: result[attr] = v - for attr in self.user_metadata_keys: - if self.get(attr) is not None: - result[attr] = self.get(attr) + for attr in _data['user_metadata'].iterkeys(): + v = _data['user_metadata'][attr]['#value#'] + if v is not None: + result[attr] = v + if _data['user_metadata'][attr]['datatype'] == 'series': + result[attr+'_index'] = _data['user_metadata'][attr]['#extra#'] return result # Old Metadata API {{{ @@ -184,45 +207,49 @@ class Metadata(object): ''' if other.title and other.title != _('Unknown'): self.title = other.title + if hasattr(other, 'title_sort'): + self.title_sort = other.title_sort if other.authors and other.authors[0] != _('Unknown'): self.authors = other.authors + if hasattr(other, 'author_sort_map'): + self.author_sort_map = other.author_sort_map + if hasattr(other, 'author_sort'): + self.author_sort = other.author_sort - for attr in COPYABLE_METADATA_FIELDS: - if replace_metadata: + if replace_metadata: + for attr in COPYABLE_METADATA_FIELDS: setattr(self, attr, getattr(other, attr, 1.0 if \ attr == 'series_index' else None)) - elif hasattr(other, attr): - val = getattr(other, attr) - if val is not None: - setattr(self, attr, copy.deepcopy(val)) - - if replace_metadata: self.tags = other.tags - elif other.tags: - self.tags += other.tags - self.tags = list(set(self.tags)) - - if getattr(other, 'author_sort_map', None): - self.author_sort_map.update(other.author_sort_map) - - if getattr(other, 'cover_data', False): - other_cover = other.cover_data[-1] - self_cover = self.cover_data[-1] if self.cover_data else '' - if not self_cover: self_cover = '' - if not other_cover: other_cover = '' - if len(other_cover) > len(self_cover): - self.cover_data = other.cover_data - - if getattr(other, 'user_metadata_keys', None): - for x in other.user_metadata_keys: - meta = other.get_user_metadata(x) - if meta is not None or replace_metadata: - self.set_user_metadata(x, meta) # get... did the deepcopy - - if replace_metadata: + self.cover_data = getattr(other, 'cover_data', '') + self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) self.comments = getattr(other, 'comments', '') + self.language = getattr(other, 'language', None) else: + for attr in COPYABLE_METADATA_FIELDS: + if hasattr(other, attr): + val = getattr(other, attr) + if val is not None: + setattr(self, attr, copy.deepcopy(val)) + + if other.tags: + self.tags += list(set(self.tags + other.tags)) + + if getattr(other, 'cover_data', False): + other_cover = other.cover_data[-1] + self_cover = self.cover_data[-1] if self.cover_data else '' + if not self_cover: self_cover = '' + if not other_cover: other_cover = '' + if len(other_cover) > len(self_cover): + self.cover_data = other.cover_data + + if getattr(other, 'user_metadata_keys', None): + for x in other.user_metadata_keys: + meta = other.get_user_metadata(x) + if meta is not None: + self.set_user_metadata(x, meta) # get... did the deepcopy + my_comments = getattr(self, 'comments', '') other_comments = getattr(other, 'comments', '') if not my_comments: @@ -232,10 +259,9 @@ class Metadata(object): if len(other_comments.strip()) > len(my_comments.strip()): self.comments = other_comments - other_lang = getattr(other, 'language', None) - if other_lang and other_lang.lower() != 'und': - self.language = other_lang - + other_lang = getattr(other, 'language', None) + if other_lang and other_lang.lower() != 'und': + self.language = other_lang def format_series_index(self): from calibre.ebooks.metadata import fmt_sidx diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 5e13650f0e..7a80e16854 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -70,7 +70,7 @@ class JsonCodec(object): def encode_metadata_attr(self, book, key): if key == 'user_metadata': - meta = book.all_user_metadata + meta = book.get_all_user_metadata(make_copy=True) for k in meta: if meta[k]['datatype'] == 'datetime': meta[k]['#value#'] = datetime_to_string(meta[k]['#value#']) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 9f21fe0eda..935776f838 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -22,6 +22,7 @@ from calibre.library.sqlite import connect, IntegrityError, DBThread from calibre.library.prefs import DBPrefs from calibre.ebooks.metadata import string_to_authors, authors_to_string, \ MetaInformation +from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats from calibre.constants import preferred_encoding, iswindows, isosx, filesystem_encoding from calibre.ptempfile import PersistentTemporaryFile @@ -537,7 +538,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): for key,meta in self.field_metadata.iteritems(): if meta['is_custom']: mi.set_user_metadata(key, meta) - mi.set(key, self.get_custom(idx, label=meta['label'], index_is_id=index_is_id)) + mi.set(key, val=self.get_custom(idx, label=meta['label'], + index_is_id=index_is_id), + extra=self.get_custom_extra(idx, label=meta['label'], + index_is_id=index_is_id)) if get_cover: mi.cover = self.cover(id, index_is_id=True, as_path=True) return mi @@ -1038,6 +1042,15 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if getattr(mi, 'timestamp', None) is not None: doit(self.set_timestamp, id, mi.timestamp, notify=False) self.set_path(id, True) + + user_mi = mi.get_all_user_metadata(make_copy=False) + for key in user_mi.iterkeys(): + if key in self.field_metadata and \ + user_mi[key]['datatype'] == self.field_metadata[key]['datatype']: + doit(self.set_custom, id, + val=Metadata.get_user_metadata_value(user_mi[key]), + extra=Metadata.get_user_metadata_extra(user_mi[key]), + label=user_mi[key]['label']) self.notify('metadata', [id]) # Given a book, return the list of author sort strings for the book's authors diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 258ea7ba9e..7a3515305b 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -115,7 +115,7 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, library_order = tweaks['save_template_title_series_sorting'] == 'library_order' tsfmt = title_sort if library_order else lambda x: x format_args = dict(**FORMAT_ARGS) - format_args.update(mi.all_attributes) + format_args.update(mi.get_all_non_none_attributes()) if mi.title: format_args['title'] = tsfmt(mi.title) if mi.authors: @@ -131,6 +131,8 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, format_args['series_index'] = mi.format_series_index() else: template = re.sub(r'\{series_index[^}]*?\}', '', template) + ## TODO: format custom values. Check all the datatypes. + if mi.rating is not None: format_args['rating'] = mi.format_rating() if hasattr(mi.timestamp, 'timetuple'): @@ -139,15 +141,6 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, format_args['pubdate'] = strftime(timefmt, mi.pubdate.timetuple()) format_args['id'] = str(id) - # These are not necessary any more. The values are set by - # 'format_args.update' above, and there is no special formatting -# if mi.author_sort: -# format_args['author_sort'] = mi.author_sort -# if mi.isbn: -# format_args['isbn'] = mi.isbn -# if mi.publisher: -# format_args['publisher'] = mi.publisher - components = [x.strip() for x in template.split('/') if x.strip()] components = [safe_format(x, format_args) for x in components] components = [sanitize_func(x) for x in components if x] From 65f8767057afa440c143353c52e038a092da6783 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 29 Aug 2010 11:18:09 +0100 Subject: [PATCH 005/235] New metadata: 1) remove 'category' from standard metadata fields 2) make isbn a classifier. Add ability to add more classifiers 3) fixup TODO: to make them easier to find. --- src/calibre/devices/usbms/books.py | 1 + src/calibre/ebooks/metadata/book/__init__.py | 12 ++++++--- src/calibre/ebooks/metadata/book/base.py | 25 ++++++------------- src/calibre/ebooks/metadata/opf2.py | 2 +- .../gui2/dialogs/config/save_template.py | 4 +-- src/calibre/library/save_to_disk.py | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index e3c405ee4e..0efa507e09 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -135,6 +135,7 @@ class CollectionsBookList(BookList): elif isinstance(val, unicode): val = [val] for category in val: + # TODO: NEWMETA: format the custom fields if attr == 'tags' and len(category) > 1 and \ category[0] == '[' and category[-1] == ']': continue diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index fbcca79aba..47eb616394 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -19,8 +19,14 @@ SOCIAL_METADATA_FIELDS = frozenset([ # Of the form { scheme1:value1, scheme2:value2} # For example: {'isbn':'123456789', 'doi':'xxxx', ... } 'classifiers', - 'isbn', # Pseudo field for convenience, should get/set isbn classifier - 'category', # TODO: not sure what this is, but it is used by OPF +]) + +''' +The list of names that convert to classifiers when in get and set. +''' + +TOP_LEVEL_CLASSIFIERS = frozenset([ + 'isbn', ]) PUBLICATION_METADATA_FIELDS = frozenset([ @@ -77,7 +83,7 @@ CALIBRE_METADATA_FIELDS = frozenset([ 'application_id', # An application id, currently set to the db_id. # the calibre primary key of the item. 'db_id', # the calibre primary key of the item. - # TODO: May want to remove once Sony's no longer use it + # TODO: NEWMETA: May want to remove once Sony's no longer use it ] ) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index a81ce46c34..6d89049bfb 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -11,6 +11,7 @@ import traceback from calibre import prints from calibre.ebooks.metadata.book import COPYABLE_METADATA_FIELDS from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS +from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS from calibre.utils.date import isoformat @@ -55,6 +56,8 @@ class Metadata(object): def __getattribute__(self, field): _data = object.__getattribute__(self, '_data') + if field in TOP_LEVEL_CLASSIFIERS: + return _data.get('classifiers').get(field, None) if field in STANDARD_METADATA_FIELDS: return _data.get(field, None) try: @@ -68,7 +71,9 @@ class Metadata(object): def __setattr__(self, field, val, extra=None): _data = object.__getattribute__(self, '_data') - if field in STANDARD_METADATA_FIELDS: + if field in TOP_LEVEL_CLASSIFIERS: + _data['classifiers'].update({field: val}) + elif field in STANDARD_METADATA_FIELDS: if val is None: val = NULL_VALUES.get(field, None) _data[field] = val @@ -301,8 +306,6 @@ class Metadata(object): fmt('Publisher', self.publisher) if getattr(self, 'book_producer', False): fmt('Book Producer', self.book_producer) - if self.category: - fmt('Category', self.category) if self.comments: fmt('Comments', self.comments) if self.isbn: @@ -321,14 +324,7 @@ class Metadata(object): fmt('Published', isoformat(self.pubdate)) if self.rights is not None: fmt('Rights', unicode(self.rights)) -# TODO: These are not in metadata. Should they be? -# if self.lccn: -# fmt('LCCN', unicode(self.lccn)) -# if self.lcc: -# fmt('LCC', unicode(self.lcc)) -# if self.ddc: -# fmt('DDC', unicode(self.ddc)) - # CUSTFIELD: What to do about custom fields? + # TODO: NEWMETA: What to do about custom fields? return u'\n'.join(ans) def to_html(self): @@ -339,13 +335,6 @@ class Metadata(object): ans += [(_('Producer'), unicode(self.book_producer))] ans += [(_('Comments'), unicode(self.comments))] ans += [('ISBN', unicode(self.isbn))] -# TODO: These are not in metadata. Should they be? -# if self.lccn: -# ans += [('LCCN', unicode(self.lccn))] -# if self.lcc: -# ans += [('LCC', unicode(self.lcc))] -# if self.ddc: -# ans += [('DDC', unicode(self.ddc))] ans += [(_('Tags'), u', '.join([unicode(t) for t in self.tags]))] if self.series: ans += [(_('Series'), unicode(self.series)+ ' #%s'%self.format_series_index())] diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 0ab6d3bbc0..54d97fc157 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -1188,7 +1188,7 @@ def metadata_to_opf(mi, as_string=True): factory(DC('contributor'), mi.book_producer, __appname__, 'bkp') if hasattr(mi.pubdate, 'isoformat'): factory(DC('date'), isoformat(mi.pubdate)) - if mi.category: + if hasattr(mi, 'category') and mi.category: factory(DC('type'), mi.category) if mi.comments: factory(DC('description'), mi.comments) diff --git a/src/calibre/gui2/dialogs/config/save_template.py b/src/calibre/gui2/dialogs/config/save_template.py index 2157d5b3bf..7e49e86d29 100644 --- a/src/calibre/gui2/dialogs/config/save_template.py +++ b/src/calibre/gui2/dialogs/config/save_template.py @@ -34,8 +34,8 @@ class SaveTemplate(QWidget, Ui_Form): self.option_name = name def validate(self): - # TODO: I haven't figured out how to get the custom columns into here, - # so for the moment make all templates valid. + # TODO: NEWMETA: I haven't figured out how to get the custom columns + # into here, so for the moment make all templates valid. return True # tmpl = preprocess_template(self.opt_template.text()) # fa = {} diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 7a3515305b..963afd4085 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -131,7 +131,7 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, format_args['series_index'] = mi.format_series_index() else: template = re.sub(r'\{series_index[^}]*?\}', '', template) - ## TODO: format custom values. Check all the datatypes. + ## TODO: NEWMETA: format custom values. Check all the datatypes. if mi.rating is not None: format_args['rating'] = mi.format_rating() From 6eb7383e82b564a146cd9e719d6424ec8f79c355 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 30 Aug 2010 12:16:37 +0100 Subject: [PATCH 006/235] Remove unused (and unworking) copy method --- src/calibre/ebooks/metadata/book/base.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 6d89049bfb..dcb31c3ecc 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -185,17 +185,6 @@ class Metadata(object): return result # Old Metadata API {{{ - @staticmethod - def copy(mi): - ans = Metadata(mi.title, mi.authors) - for attr in STANDARD_METADATA_FIELDS: - if hasattr(mi, attr): - setattr(ans, attr, copy.deepcopy(getattr(mi, attr))) - for x in mi.user_metadata_keys: - meta = mi.get_user_metadata(x) - if meta is not None: - ans.set_user_metadata(x, meta) # get... did the deep copy - def print_all_attributes(self): for x in STANDARD_METADATA_FIELDS: prints('%s:'%x, getattr(self, x, 'None')) @@ -347,7 +336,7 @@ class Metadata(object): ans += [(_('Rights'), unicode(self.rights))] for i, x in enumerate(ans): ans[i] = u'%s%s'%x - # CUSTFIELD: What to do about custom fields + # TODO: NEWMETA: What to do about custom fields return u'%s
'%u'\n'.join(ans) def __str__(self): From 11f7bd06a82a0b1d03afffd374344593dfb0c5dc Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 30 Aug 2010 17:47:25 +0100 Subject: [PATCH 007/235] Format custom fields in save_to_disk. --- src/calibre/library/save_to_disk.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 963afd4085..2bc71cde9c 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -14,6 +14,7 @@ from calibre.utils.filenames import shorten_components_to, supports_long_names, from calibre.ebooks.metadata.opf2 import metadata_to_opf from calibre.ebooks.metadata.meta import set_metadata from calibre.constants import preferred_encoding, filesystem_encoding +from calibre.ebooks.metadata import fmt_sidx from calibre.ebooks.metadata import title_sort from calibre import strftime @@ -131,8 +132,6 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, format_args['series_index'] = mi.format_series_index() else: template = re.sub(r'\{series_index[^}]*?\}', '', template) - ## TODO: NEWMETA: format custom values. Check all the datatypes. - if mi.rating is not None: format_args['rating'] = mi.format_rating() if hasattr(mi.timestamp, 'timetuple'): @@ -140,6 +139,19 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, if hasattr(mi.pubdate, 'timetuple'): format_args['pubdate'] = strftime(timefmt, mi.pubdate.timetuple()) format_args['id'] = str(id) + # Now format the custom fields + custom_metadata = mi.get_all_user_metadata(make_copy=False) + for key in custom_metadata: + if key in format_args: + ## TODO: NEWMETA: should ratings be divided by 2? The standard rating isn't... + if custom_metadata[key]['datatype'] == 'series': + format_args[key] = tsfmt(format_args[key]) + if key+'_index' in format_args: + format_args[key+'_index'] = fmt_sidx(format_args[key+'_index']) + elif custom_metadata[key]['datatype'] == 'datetime': + format_args[key] = strftime(timefmt, format_args[key].timetuple()) + elif custom_metadata[key]['datatype'] == 'bool': + format_args[key] = _('yes') if format_args[key] else _('no') components = [x.strip() for x in template.split('/') if x.strip()] components = [safe_format(x, format_args) for x in components] From 16e5b2f3b0204efefe1c73531c4ce98376342fc7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 1 Sep 2010 16:44:12 +0100 Subject: [PATCH 008/235] Add code for Sony collections --- resources/default_tweaks.py | 32 ++++++- src/calibre/devices/usbms/books.py | 95 ++++++++++++++------ src/calibre/ebooks/metadata/book/__init__.py | 2 +- src/calibre/ebooks/metadata/book/base.py | 17 ++-- 4 files changed, 111 insertions(+), 35 deletions(-) diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index e03b0680be..e68096ecd5 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -90,4 +90,34 @@ save_template_title_series_sorting = 'library_order' # Examples: # auto_connect_to_folder = 'C:\\Users\\someone\\Desktop\\testlib' # auto_connect_to_folder = '/home/dropbox/My Dropbox/someone/library' -auto_connect_to_folder = '' \ No newline at end of file +auto_connect_to_folder = '' + +# Specify renaming rules for sony collections. Collections on Sonys are named +# depending upon whether the field is standard or custom. A collection derived +# from a standard field is named for the value in that field. For example, if +# the standard 'series' column contains the name 'Darkover', then the series +# will be named 'Darkover'. A collection derived from a custom field will have +# the name of the field added to the value. For example, if a custom series +# column named 'My Series' contains the name 'Darkover', then the collection +# will be named 'Darkover (My Series)'. If two books have fields that generate +# the same collection name, then both books will be in that collection. This +# tweak lets you specify for a standard or custom field the value to be put +# inside the parentheses. You can use it to add a parenthetical description to a +# standard field, for example 'Foo (Tag)' instead of the 'Foo'. You can also use +# it to force multiple fields to end up in the same collection. For example, you +# could force the values in 'series', '#my_series_1', and '#my_series_2' to +# appear in collections named 'some_value (Series)', thereby merging all of the +# fields into one set of collections. The syntax of this tweak is +# {'field_lookup_name':'name_to_use', 'lookup_name':'name', ...} +# Example 1: I want three series columns to be merged into one set of +# collections. If the column lookup names are 'series', '#series_1' and +# '#series_2', and if I want nothing in the parenthesis, then the value to use +# in the tweak value would be: +# sony_collection_renaming_rules={'series':'', '#series_1':'', '#series_2':''} +# Example 2: I want the word '(Series)' to appear on collections made from +# series, and the word '(Tag)' to appear on collections made from tags. Use: +# sony_collection_renaming_rules={'series':'Series', 'tags':'Tag'} +# Example 3: I want 'series' and '#myseries' to be merged, and for the +# collection name to have '(Series)' appended. The renaming rule is: +# sony_collection_renaming_rules={'series':'Series', '#myseries':'Series'} +sony_collection_renaming_rules={} \ No newline at end of file diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 0efa507e09..3e13527bd0 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -9,9 +9,10 @@ import os, re, time, sys from calibre.ebooks.metadata.book.base import Metadata from calibre.devices.mime import mime_type_ext from calibre.devices.interface import BookList as _BookList -from calibre.constants import filesystem_encoding, preferred_encoding +from calibre.constants import preferred_encoding from calibre import isbytestring -from calibre.utils.config import prefs +from calibre.utils.config import prefs, tweaks +from calibre.utils.date import format_date class Book(Metadata): def __init__(self, prefix, lpath, size=None, other=None): @@ -94,11 +95,38 @@ class CollectionsBookList(BookList): def supports_collections(self): return True + def compute_category_name(self, attr, category, cust_field_meta): + renames = tweaks['sony_collection_renaming_rules'] + attr_name = renames.get(attr, None) + if attr_name is None: + if attr in cust_field_meta: + attr_name = '(%s)'%cust_field_meta[attr]['name'] + else: + attr_name = '' + elif attr_name != '': + attr_name = '(%s)'%attr_name + + if attr not in cust_field_meta: + cat_name = '%s %s'%(category, attr_name) + else: + fm = cust_field_meta[attr] + if fm['datatype'] == 'bool': + if category: + cat_name = '%s %s'%(_('Yes'), attr_name) + else: + cat_name = '%s %s'%(_('No'), attr_name) + elif fm['datatype'] == 'datetime': + cat_name = '%s %s'%(format_date(category, + fm['display'].get('date_format','dd MMM yyyy')), attr_name) + else: + cat_name = '%s %s'%(category, attr_name) + return cat_name.strip() + def get_collections(self, collection_attributes): from calibre.devices.usbms.driver import debug_print debug_print('Starting get_collections:', prefs['manage_device_metadata']) + debug_print('Renaming rules:', tweaks['sony_collection_renaming_rules']) collections = {} - series_categories = set([]) # This map of sets is used to avoid linear searches when testing for # book equality collections_lpaths = {} @@ -124,42 +152,55 @@ class CollectionsBookList(BookList): # For existing books, modify the collections only if the user # specified 'on_connect' attrs = collection_attributes + meta_vals = book.get_all_non_none_attributes() + cust_field_meta = book.get_all_user_metadata(make_copy=False) for attr in attrs: attr = attr.strip() - val = getattr(book, attr, None) + val = meta_vals.get(attr, None) if not val: continue if isbytestring(val): val = val.decode(preferred_encoding, 'replace') if isinstance(val, (list, tuple)): val = list(val) - elif isinstance(val, unicode): + else: val = [val] for category in val: - # TODO: NEWMETA: format the custom fields - if attr == 'tags' and len(category) > 1 and \ - category[0] == '[' and category[-1] == ']': + is_series = False + if attr in cust_field_meta: # is a custom field + fm = cust_field_meta[attr] + if fm['datatype'] == 'text' and len(category) > 1 and \ + category[0] == '[' and category[-1] == ']': + continue + if fm['datatype'] == 'series': + is_series = True + else: # is a standard field + if attr == 'tags' and len(category) > 1 and \ + category[0] == '[' and category[-1] == ']': + continue + if attr == 'series' or \ + ('series' in collection_attributes and + meta_vals.get('series', None) == category): + is_series = True + cat_name = self.compute_category_name(attr, category, + cust_field_meta) + if cat_name not in collections: + collections[cat_name] = [] + collections_lpaths[cat_name] = set() + if lpath in collections_lpaths[cat_name]: continue - if category not in collections: - collections[category] = [] - collections_lpaths[category] = set() - if lpath not in collections_lpaths[category]: - collections_lpaths[category].add(lpath) - collections[category].append(book) - if attr == 'series' or \ - ('series' in collection_attributes and - getattr(book, 'series', None) == category): - series_categories.add(category) + collections_lpaths[cat_name].add(lpath) + if is_series: + collections[cat_name].append( + (book, meta_vals.get(attr+'_index', sys.maxint))) + else: + collections[cat_name].append( + (book, meta_vals.get('title_sort', 'zzzz'))) # Sort collections + result = {} for category, books in collections.items(): - def tgetter(x): - return getattr(x, 'title_sort', 'zzzz') - books.sort(cmp=lambda x,y:cmp(tgetter(x), tgetter(y))) - if category in series_categories: - # Ensures books are sub sorted by title - def getter(x): - return getattr(x, 'series_index', sys.maxint) - books.sort(cmp=lambda x,y:cmp(getter(x), getter(y))) - return collections + books.sort(cmp=lambda x,y:cmp(x[1], y[1])) + result[category] = [x[0] for x in books] + return result def rebuild_collections(self, booklist, oncard): ''' diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index 47eb616394..ca7f4f7074 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -109,7 +109,7 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( CALIBRE_METADATA_FIELDS) - \ frozenset(['title', 'title_sort', 'authors', 'author_sort', 'author_sort_map' 'comments', - 'cover_data', 'tags', 'language']) + 'cover_data', 'tags', 'language', 'lpath']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index dcb31c3ecc..3f5507d676 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -117,16 +117,18 @@ class Metadata(object): res[k] = copy.deepcopy(user_metadata[k]) return res - def get_user_metadata(self, field): + def get_user_metadata(self, field, make_copy): ''' return field metadata from the object if it is there. Otherwise return - None. field is the key name, not the label. Return a copy, just in case - the user wants to change values in the dict (json does). + None. field is the key name, not the label. Return a copy if requested, + just in case the user wants to change values in the dict. ''' _data = object.__getattribute__(self, '_data') _data = _data['user_metadata'] if field in _data: - return copy.deepcopy(_data[field]) + if make_copy: + return copy.deepcopy(_data[field]) + return _data[field] return None @classmethod @@ -189,7 +191,7 @@ class Metadata(object): for x in STANDARD_METADATA_FIELDS: prints('%s:'%x, getattr(self, x, 'None')) for x in self.user_metadata_keys: - meta = self.get_user_metadata(x) + meta = self.get_user_metadata(x, make_copy=False) if meta is not None: prints(x, meta) prints('--------------') @@ -220,6 +222,9 @@ class Metadata(object): self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) self.comments = getattr(other, 'comments', '') self.language = getattr(other, 'language', None) + lpath = getattr(other, 'lpath', None) + if lpath is not None: + self.lpath = lpath else: for attr in COPYABLE_METADATA_FIELDS: if hasattr(other, attr): @@ -240,7 +245,7 @@ class Metadata(object): if getattr(other, 'user_metadata_keys', None): for x in other.user_metadata_keys: - meta = other.get_user_metadata(x) + meta = other.get_user_metadata(x, make_copy=True) if meta is not None: self.set_user_metadata(x, meta) # get... did the deepcopy From 0606afc8ff6edb0dfb6042bbc6cde3f891a068e9 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 2 Sep 2010 13:19:01 +0100 Subject: [PATCH 009/235] 1) make to_html support custom fields 2) clean up the _extra code 3) add a format_custom_field method to avoid duplicating code 4) pass custom metadata to book_details --- src/calibre/ebooks/metadata/book/base.py | 43 ++++++++++++++++++------ src/calibre/gui2/book_details.py | 2 ++ src/calibre/gui2/library/models.py | 6 +++- src/calibre/library/database2.py | 4 +-- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 3f5507d676..caaaccb3d0 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -12,7 +12,8 @@ from calibre import prints from calibre.ebooks.metadata.book import COPYABLE_METADATA_FIELDS from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS -from calibre.utils.date import isoformat +from calibre.utils.date import isoformat, format_date + NULL_VALUES = { @@ -94,6 +95,13 @@ class Metadata(object): return default return self.__getattribute__(field) + def get_extra(self, field): + _data = object.__getattribute__(self, '_data') + if field in _data['user_metadata'].iterkeys(): + return _data['user_metadata'][field]['#extra#'] + raise AttributeError( + 'Metadata object has no attribute named: '+ repr(field)) + def set(self, field, val, extra=None): self.__setattr__(field, val, extra) @@ -131,14 +139,6 @@ class Metadata(object): return _data[field] return None - @classmethod - def get_user_metadata_value(user_mi): - return user_mi['#value#'] - - @classmethod - def get_user_metadata_extra(user_mi): - return user_mi['#extra#'] - def set_all_user_metadata(self, metadata): ''' store custom field metadata into the object. Field is the key name @@ -284,6 +284,25 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) + def format_custom_field(self, key): + ''' + returns the tuple (field_name, formatted_value) + ''' + cmeta = self.get_user_metadata(key, make_copy=False) + name = unicode(cmeta['name']) + res = self.get(key, None) + if res is not None: + datatype = cmeta['datatype'] + if datatype == 'text' and cmeta['is_multiple']: + res = u', '.join(res) + elif datatype == 'series': + res = res + ' [%s]'%self.format_series_index(self.get_extra(key)) + elif datatype == 'datetime': + res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) + elif datatype == 'bool': + res = _('Yes') if res else _('No') + return (name, unicode(res)) + def __unicode__(self): from calibre.ebooks.metadata import authors_to_string ans = [] @@ -339,9 +358,13 @@ class Metadata(object): ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] if self.rights is not None: ans += [(_('Rights'), unicode(self.rights))] + for key in self.user_metadata_keys: + val = self.get(key, None) + if val is not None: + (name, val) = self.format_custom_field(key) + ans += [(name, val)] for i, x in enumerate(ans): ans[i] = u'%s%s'%x - # TODO: NEWMETA: What to do about custom fields return u'%s
'%u'\n'.join(ans) def __str__(self): diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py index f08dd09429..4e11e0c84f 100644 --- a/src/calibre/gui2/book_details.py +++ b/src/calibre/gui2/book_details.py @@ -28,6 +28,8 @@ WEIGHTS[_('Tags')] = 4 def render_rows(data): keys = data.keys() + # First sort by name. The WEIGHTS sort will preserve this sub-order + keys.sort(cmp=lambda x, y: cmp(x.lower(), y.lower())) keys.sort(cmp=lambda x, y: cmp(WEIGHTS[x], WEIGHTS[y])) rows = [] for key in keys: diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index fdf21ecc23..2711756856 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -323,7 +323,11 @@ class BooksModel(QAbstractTableModel): # {{{ data[_('Series')] = \ _('Book %s of %s.')%\ (sidx, prepare_string_for_xml(series)) - + mi = self.db.get_metadata(idx) + for key in mi.user_metadata_keys: + name, val = mi.format_custom_field(key) + if val is not None: + data[name] = val return data def set_cache(self, idx): diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 6457e12905..bb6d72bcff 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -1052,8 +1052,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if key in self.field_metadata and \ user_mi[key]['datatype'] == self.field_metadata[key]['datatype']: doit(self.set_custom, id, - val=Metadata.get_user_metadata_value(user_mi[key]), - extra=Metadata.get_user_metadata_extra(user_mi[key]), + val=mi.get(key), + extra=mi.get_extra(key), label=user_mi[key]['label']) self.notify('metadata', [id]) From 7ff7da0fbb2485301142a6ba2e6c04923a6d4a59 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 3 Sep 2010 18:43:17 +0100 Subject: [PATCH 010/235] Remove relative import --- src/calibre/ebooks/metadata/book/json_codec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 7a80e16854..96178c4a63 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -9,7 +9,7 @@ import json import traceback from PIL import Image -from . import SERIALIZABLE_FIELDS +from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS from calibre.constants import filesystem_encoding, preferred_encoding from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE From 0ba513e2879b5e476d4787b333fb82b8dbe2e914 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 5 Sep 2010 11:01:55 +0100 Subject: [PATCH 011/235] Add a comment about not using the Metadata class, and why --- src/calibre/library/server/mobile.py | 4 ++++ src/calibre/library/server/xml.py | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index 229e0c21c4..6e08581aed 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -199,6 +199,10 @@ class MobileServer(object): CKEYS = [key for key in sorted(CFM.get_custom_fields(), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] + # This method uses its own book dict, not the Metadata dict. The loop + # below could be changed to use db.get_metadata instead of reading + # info directly from the record made by the view, but it doesn't seem + # worth it at the moment. books = [] for record in items[(start-1):(start-1)+num]: book = {'formats':record[FM['formats']], 'size':record[FM['size']]} diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py index ed8479980e..5bf2783f96 100644 --- a/src/calibre/library/server/xml.py +++ b/src/calibre/library/server/xml.py @@ -66,6 +66,10 @@ class XMLServer(object): return x.decode(preferred_encoding, 'replace') return unicode(x) + # This method uses its own book dict, not the Metadata dict. The loop + # below could be changed to use db.get_metadata instead of reading + # info directly from the record made by the view, but it doesn't seem + # worth it at the moment. for record in items[start:start+num]: kwargs = {} aus = record[FM['authors']] if record[FM['authors']] else __builtin__._('Unknown') @@ -138,6 +142,3 @@ class XMLServer(object): return etree.tostring(ans, encoding='utf-8', pretty_print=True, xml_declaration=True) - - - From 38c6199c7b54b243d039aba25cad86125326a582 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 5 Sep 2010 11:06:54 +0100 Subject: [PATCH 012/235] Change some comments from 'class:MetaInformation' to 'class:Metadata' --- src/calibre/customize/__init__.py | 4 ++-- src/calibre/devices/apple/driver.py | 2 +- src/calibre/ebooks/metadata/epub.py | 2 +- src/calibre/ebooks/metadata/fetch.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index 27e319de14..8ddc791b2f 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -218,7 +218,7 @@ class MetadataReaderPlugin(Plugin): # {{{ with the input data. :param type: The type of file. Guaranteed to be one of the entries in :attr:`file_types`. - :return: A :class:`calibre.ebooks.metadata.MetaInformation` object + :return: A :class:`calibre.ebooks.metadata.book.Metadata` object ''' return None # }}} @@ -248,7 +248,7 @@ class MetadataWriterPlugin(Plugin): # {{{ with the input data. :param type: The type of file. Guaranteed to be one of the entries in :attr:`file_types`. - :param mi: A :class:`calibre.ebooks.metadata.MetaInformation` object + :param mi: A :class:`calibre.ebooks.metadata.book.Metadata` object ''' pass diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 75517e9df7..94aea1e79d 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -872,7 +872,7 @@ class ITUNES(DriverBase): once uploaded to the device. len(names) == len(files) :return: A list of 3-element tuples. The list is meant to be passed to L{add_books_to_metadata}. - :metadata: If not None, it is a list of :class:`MetaInformation` objects. + :metadata: If not None, it is a list of :class:`Metadata` objects. The idea is to use the metadata to determine where on the device to put the book. len(metadata) == len(files). Apart from the regular cover (path to cover), there may also be a thumbnail attribute, which should diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py index 041a1ee603..ac6b5feebe 100644 --- a/src/calibre/ebooks/metadata/epub.py +++ b/src/calibre/ebooks/metadata/epub.py @@ -164,7 +164,7 @@ def get_cover(opf, opf_path, stream, reader=None): return render_html_svg_workaround(cpage, default_log) def get_metadata(stream, extract_cover=True): - """ Return metadata as a :class:`MetaInformation` object """ + """ Return metadata as a :class:`Metadata` object """ stream.seek(0) reader = OCFZipReader(stream) mi = MetaInformation(reader.opf) diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py index 96807c06ae..9b8a42e482 100644 --- a/src/calibre/ebooks/metadata/fetch.py +++ b/src/calibre/ebooks/metadata/fetch.py @@ -29,7 +29,7 @@ class MetadataSource(Plugin): # {{{ future use. The fetch method must store the results in `self.results` as a list of - :class:`MetaInformation` objects. If there is an error, it should be stored + :class:`Metadata` objects. If there is an error, it should be stored in `self.exception` and `self.tb` (for the traceback). ''' From 06b266840c8785aa93aa265c0c20308c1c7286f7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 5 Sep 2010 12:35:35 +0100 Subject: [PATCH 013/235] Make gui version of content server able to show both abbreviated and full lists of tags. --- resources/content_server/gui.js | 34 ++++++++++++++++++++++++ src/calibre/ebooks/metadata/book/base.py | 7 ++--- src/calibre/library/server/utils.py | 9 ++++--- src/calibre/library/server/xml.py | 6 +++-- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/resources/content_server/gui.js b/resources/content_server/gui.js index 8368866a5e..abbd409dc8 100644 --- a/resources/content_server/gui.js +++ b/resources/content_server/gui.js @@ -59,14 +59,44 @@ function render_book(book) { title = title.slice(0, title.length-2); title += ' ({0} MB) '.format(size); } + title += '' + if (tags) { + t = tags.split(':&:', 2); + m = parseInt(t[0]); + t = t[1].split(',', m); + if (t.length == m) t[m] = '...' + title += 'Tags=[{0}] '.format(t.join(',')); + } + custcols = book.attr("custcols").split(',') + for ( i = 0; i < custcols.length; i++) { + if (custcols[i].length > 0) { + vals = book.attr(custcols[i]).split(':#:', 2); + if (vals[0].indexOf('#T#') == 0) { //startswith + vals[0] = vals[0].substr(3, vals[0].length) + t = vals[1].split(':&:', 2); + m = parseInt(t[0]); + t = t[1].split(',', m); + if (t.length == m) t[m] = '...'; + vals[1] = t.join(','); + } + title += '{0}=[{1}] '.format(vals[0], vals[1]); + } + } + title += '' + title += '' title += ''.format(id); title += '

{0}
'.format(comments) // Render authors cell @@ -170,11 +200,15 @@ function fetch_library_books(start, num, timeout, sort, order, search) { var cover = row.find('img').attr('src'); var collapsed = row.find('.comments').css('display') == 'none'; $("#book_list tbody tr * .comments").css('display', 'none'); + $("#book_list tbody tr * .tagdata_short").css('display', 'inherit'); + $("#book_list tbody tr * .tagdata_long").css('display', 'none'); $('#cover_pane').css('visibility', 'hidden'); if (collapsed) { row.find('.comments').css('display', 'inherit'); $('#cover_pane img').attr('src', cover); $('#cover_pane').css('visibility', 'visible'); + row.find(".tagdata_short").css('display', 'none'); + row.find(".tagdata_long").css('display', 'inherit'); } }); diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index caaaccb3d0..2ff24b0ddc 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -262,10 +262,11 @@ class Metadata(object): if other_lang and other_lang.lower() != 'und': self.language = other_lang - def format_series_index(self): + def format_series_index(self, val=None): from calibre.ebooks.metadata import fmt_sidx + v = self.series_index if val is None else val try: - x = float(self.series_index) + x = float(v) except ValueError: x = 1 return fmt_sidx(x) @@ -296,7 +297,7 @@ class Metadata(object): if datatype == 'text' and cmeta['is_multiple']: res = u', '.join(res) elif datatype == 'series': - res = res + ' [%s]'%self.format_series_index(self.get_extra(key)) + res = res + ' [%s]'%self.format_series_index(val=self.get_extra(key)) elif datatype == 'datetime': res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': diff --git a/src/calibre/library/server/utils.py b/src/calibre/library/server/utils.py index 23916aa75c..373653c15f 100644 --- a/src/calibre/library/server/utils.py +++ b/src/calibre/library/server/utils.py @@ -5,7 +5,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import time +import time, sys import cherrypy @@ -44,8 +44,8 @@ def strftime(fmt='%Y/%m/%d %H:%M:%S', dt=None): except: return _strftime(fmt, nowf().timetuple()) -def format_tag_string(tags, sep): - MAX = tweaks['max_content_server_tags_shown'] +def format_tag_string(tags, sep, ignore_max=False): + MAX = sys.maxint if ignore_max else tweaks['max_content_server_tags_shown'] if tags: tlist = [t.strip() for t in tags.split(sep)] else: @@ -53,5 +53,6 @@ def format_tag_string(tags, sep): tlist.sort(cmp=lambda x,y:cmp(x.lower(), y.lower())) if len(tlist) > MAX: tlist = tlist[:MAX]+['...'] - return u'%s'%(', '.join(tlist)) if tlist else '' + return u'%s:&:%s'%(tweaks['max_content_server_tags_shown'], + ', '.join(tlist)) if tlist else '' diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py index 5bf2783f96..8715dda7d0 100644 --- a/src/calibre/library/server/xml.py +++ b/src/calibre/library/server/xml.py @@ -89,7 +89,7 @@ class XMLServer(object): 'comments'): y = record[FM[x]] if x == 'tags': - y = format_tag_string(y, ',') + y = format_tag_string(y, ',', ignore_max=True) kwargs[x] = serialize(y) if y else '' c = kwargs.pop('comments') @@ -111,7 +111,9 @@ class XMLServer(object): name = CFM[key]['name'] custcols.append(k) if datatype == 'text' and CFM[key]['is_multiple']: - kwargs[k] = concat(name, format_tag_string(val,'|')) + kwargs[k] = concat('#T#'+name, + format_tag_string(val,'|', + ignore_max=True)) elif datatype == 'series': kwargs[k] = concat(name, '%s [%s]'%(val, fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) From 6bad998546cc2c9891bdf48a5ff89ebe8a86b0cd Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 8 Sep 2010 16:52:40 +0100 Subject: [PATCH 014/235] Add custom fields to the 'unicode' function --- src/calibre/ebooks/metadata/book/base.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 2ff24b0ddc..648beb7b5c 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -338,7 +338,11 @@ class Metadata(object): fmt('Published', isoformat(self.pubdate)) if self.rights is not None: fmt('Rights', unicode(self.rights)) - # TODO: NEWMETA: What to do about custom fields? + for key in self.user_metadata_keys: + val = self.get(key, None) + if val is not None: + (name, val) = self.format_custom_field(key) + fmt(name, unicode(val)) return u'\n'.join(ans) def to_html(self): From 9155f838f1f43d878c083bd1a9b9ce955d1c32c8 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 8 Sep 2010 19:39:57 +0100 Subject: [PATCH 015/235] Fix some bugs found after or introduced by trunk merges --- src/calibre/ebooks/metadata/book/__init__.py | 3 ++- src/calibre/ebooks/metadata/book/base.py | 26 ++++++++++---------- src/calibre/library/save_to_disk.py | 25 ++++++++++--------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index ca7f4f7074..e7f58ce858 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -109,7 +109,8 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( CALIBRE_METADATA_FIELDS) - \ frozenset(['title', 'title_sort', 'authors', 'author_sort', 'author_sort_map' 'comments', - 'cover_data', 'tags', 'language', 'lpath']) + 'cover_data', 'tags', 'language', 'lpath', + 'size']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 648beb7b5c..69a3c42f4d 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -201,6 +201,11 @@ class Metadata(object): Merge the information in C{other} into self. In case of conflicts, the information in C{other} takes precedence, unless the information in other is NULL. ''' + def copy_not_none(dest, src, attr): + v = getattr(src, attr, None) + if v is not None: + setattr(dest, attr, copy.deepcopy(v)) + if other.title and other.title != _('Unknown'): self.title = other.title if hasattr(other, 'title_sort'): @@ -220,21 +225,19 @@ class Metadata(object): self.tags = other.tags self.cover_data = getattr(other, 'cover_data', '') self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) - self.comments = getattr(other, 'comments', '') - self.language = getattr(other, 'language', None) - lpath = getattr(other, 'lpath', None) - if lpath is not None: - self.lpath = lpath + copy_not_none(self, other, 'lpath') + copy_not_none(self, other, 'size') + copy_not_none(self, other, 'comments') + # language is handled below else: for attr in COPYABLE_METADATA_FIELDS: if hasattr(other, attr): + copy_not_none(self, other, attr) val = getattr(other, attr) if val is not None: setattr(self, attr, copy.deepcopy(val)) - if other.tags: self.tags += list(set(self.tags + other.tags)) - if getattr(other, 'cover_data', False): other_cover = other.cover_data[-1] self_cover = self.cover_data[-1] if self.cover_data else '' @@ -242,13 +245,11 @@ class Metadata(object): if not other_cover: other_cover = '' if len(other_cover) > len(self_cover): self.cover_data = other.cover_data - if getattr(other, 'user_metadata_keys', None): for x in other.user_metadata_keys: meta = other.get_user_metadata(x, make_copy=True) if meta is not None: self.set_user_metadata(x, meta) # get... did the deepcopy - my_comments = getattr(self, 'comments', '') other_comments = getattr(other, 'comments', '') if not my_comments: @@ -257,10 +258,9 @@ class Metadata(object): other_comments = '' if len(other_comments.strip()) > len(my_comments.strip()): self.comments = other_comments - - other_lang = getattr(other, 'language', None) - if other_lang and other_lang.lower() != 'und': - self.language = other_lang + other_lang = getattr(other, 'language', None) + if other_lang and other_lang.lower() != 'und': + self.language = other_lang def format_series_index(self, val=None): from calibre.ebooks.metadata import fmt_sidx diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index c940cc006b..d33cbb04b5 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -6,7 +6,7 @@ __license__ = 'GPL v3' __copyright__ = '2009, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import os, traceback, cStringIO, re +import os, traceback, cStringIO, re, string from calibre.utils.config import Config, StringConfig, tweaks from calibre.utils.filenames import shorten_components_to, supports_long_names, \ @@ -98,17 +98,20 @@ def preprocess_template(template): template = template.decode(preferred_encoding, 'replace') return template +class SafeFormat(string.Formatter): + ''' + Provides a format function that substitutes '' for any missing value + ''' + def get_value(self, key, args, kwargs): + try: + return kwargs[key] + except: + return '' +safe_formatter = SafeFormat() + def safe_format(x, format_args): - try: - ans = x.format(**format_args).strip() - return re.sub(r'\s+', ' ', ans) - except IndexError: # Thrown if user used [] and index is out of bounds - pass - except AttributeError: # Thrown if user used a non existing attribute - pass - except KeyError: # Thrown if user used custom field w/value None - pass - return '' + ans = safe_formatter.vformat(x, [], format_args).strip() + return re.sub(r'\s+', ' ', ans) def get_components(template, mi, id, timefmt='%b %Y', length=250, sanitize_func=ascii_filename, replace_whitespace=False, From 7603f208b39032cbcdc42939c0753ed8ddbbe987 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 8 Sep 2010 20:29:42 +0100 Subject: [PATCH 016/235] SLight cleanup --- src/calibre/library/save_to_disk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index d33cbb04b5..3fa40c68b2 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -118,7 +118,7 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, to_lowercase=False): library_order = tweaks['save_template_title_series_sorting'] == 'library_order' tsfmt = title_sort if library_order else lambda x: x - format_args = dict(**FORMAT_ARGS) + format_args = FORMAT_ARGS.copy() format_args.update(mi.get_all_non_none_attributes()) if mi.title: format_args['title'] = tsfmt(mi.title) From f175b8bf6d75ac8615227c2557dcccc341f493d4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 10 Sep 2010 20:12:12 -0600 Subject: [PATCH 017/235] ... --- src/calibre/ebooks/metadata/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/__init__.py b/src/calibre/ebooks/metadata/__init__.py index f64a269fd1..429ba06c6e 100644 --- a/src/calibre/ebooks/metadata/__init__.py +++ b/src/calibre/ebooks/metadata/__init__.py @@ -231,7 +231,7 @@ def MetaInformation(title, authors=(_('Unknown'),)): mi = title title = mi.title authors = mi.authors - return Metadata(title, authors, mi) + return Metadata(title, authors, other=mi) def check_isbn10(isbn): try: From 4f01b09ded8a0aa21f273596051ca8f32426bef2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 11 Sep 2010 09:21:29 +0100 Subject: [PATCH 018/235] Check in the metadata class that custom field names begin with '#' --- src/calibre/ebooks/metadata/book/base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 69a3c42f4d..d0b428bf96 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -156,6 +156,9 @@ class Metadata(object): the key name not the label ''' if field is not None: + if not field.startswith('#'): + raise AttributeError( + 'Custom field name %s must begin with \'#\''%repr(field)) if metadata is None: traceback.print_stack() metadata = copy.deepcopy(metadata) From afe5546a15aa34fec849c875cb2b9b139c36ebd6 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 11 Sep 2010 09:23:03 +0100 Subject: [PATCH 019/235] Avoid spurious exceptions when adding None custom metadata --- src/calibre/ebooks/metadata/book/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index d0b428bf96..be9a4675c0 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -161,6 +161,7 @@ class Metadata(object): 'Custom field name %s must begin with \'#\''%repr(field)) if metadata is None: traceback.print_stack() + return metadata = copy.deepcopy(metadata) if '#value#' not in metadata: if metadata['datatype'] == 'text' and metadata['is_multiple']: From db54abd2b659290ba8a8d598f99fc16c853bf2f7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 12 Sep 2010 12:08:18 -0600 Subject: [PATCH 020/235] Various tweaks to the way smart_update works --- src/calibre/ebooks/metadata/book/base.py | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index be9a4675c0..f52c41e4c5 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -202,12 +202,12 @@ class Metadata(object): def smart_update(self, other, replace_metadata=False): ''' - Merge the information in C{other} into self. In case of conflicts, the information - in C{other} takes precedence, unless the information in other is NULL. + Merge the information in `other` into self. In case of conflicts, the information + in `other` takes precedence, unless the information in `other` is NULL. ''' def copy_not_none(dest, src, attr): v = getattr(src, attr, None) - if v is not None: + if v not in (None, NULL_VALUES.get(attr, None)): setattr(dest, attr, copy.deepcopy(v)) if other.title and other.title != _('Unknown'): @@ -216,32 +216,38 @@ class Metadata(object): self.title_sort = other.title_sort if other.authors and other.authors[0] != _('Unknown'): - self.authors = other.authors + self.authors = list(other.authors) if hasattr(other, 'author_sort_map'): - self.author_sort_map = other.author_sort_map + self.author_sort_map = dict(other.author_sort_map) if hasattr(other, 'author_sort'): self.author_sort = other.author_sort if replace_metadata: + SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments']) for attr in COPYABLE_METADATA_FIELDS: setattr(self, attr, getattr(other, attr, 1.0 if \ attr == 'series_index' else None)) self.tags = other.tags - self.cover_data = getattr(other, 'cover_data', '') + self.cover_data = getattr(other, 'cover_data', + NULL_VALUES['cover_data']) self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) - copy_not_none(self, other, 'lpath') - copy_not_none(self, other, 'size') - copy_not_none(self, other, 'comments') + for x in SPECIAL_FIELDS: + copy_not_none(self, other, x) # language is handled below else: for attr in COPYABLE_METADATA_FIELDS: if hasattr(other, attr): copy_not_none(self, other, attr) - val = getattr(other, attr) - if val is not None: - setattr(self, attr, copy.deepcopy(val)) if other.tags: - self.tags += list(set(self.tags + other.tags)) + # Case-insensitive but case preserving merging + lotags = [t.lower() for t in other.tags] + lstags = [t.lower() for t in self.tags] + ot, st = map(frozenset, (lotags, lstags)) + for t in st.interection(ot): + sidx = lstags.index(t) + oidx = lotags.index(t) + self.tags[sidx] = other.tags[oidx] + self.tags += [t for t in other.tags if t.lower() in ot-st] if getattr(other, 'cover_data', False): other_cover = other.cover_data[-1] self_cover = self.cover_data[-1] if self.cover_data else '' @@ -262,6 +268,7 @@ class Metadata(object): other_comments = '' if len(other_comments.strip()) > len(my_comments.strip()): self.comments = other_comments + other_lang = getattr(other, 'language', None) if other_lang and other_lang.lower() != 'und': self.language = other_lang @@ -383,3 +390,4 @@ class Metadata(object): return bool(self.title or self.author or self.comments or self.tags) # }}} + From b01b603358c0332d481a3c572fcd44d63d5cccdf Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 12 Sep 2010 13:28:22 -0600 Subject: [PATCH 021/235] json_codec: Handle dictionaries with bytsestring keys/vals as well --- .../ebooks/metadata/book/json_codec.py | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 0e205c52b0..ea0de07342 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -12,23 +12,18 @@ from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS from calibre.constants import filesystem_encoding, preferred_encoding from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE +from calibre import isbytestring # Translate datetimes to and from strings. The string form is the datetime in # UTC. The returned date is also UTC def string_to_datetime(src): if src == "None": return None -# dt = strptime(src, '%d %m %Y %H:%M:%S', assume_utc=True, as_utc=True) -# if dt == UNDEFINED_DATE: -# return None return parse_date(src) def datetime_to_string(dateval): if dateval is None or dateval == UNDEFINED_DATE: return "None" -# tt = date_to_utc(dateval).timetuple() -# res = "%02d %02d %04d %02d:%02d:%02d"%(tt.tm_mday, tt.tm_mon, tt.tm_year, -# tt.tm_hour, tt.tm_min, tt.tm_sec) return isoformat(dateval) def encode_thumbnail(thumbnail): @@ -47,6 +42,24 @@ def decode_thumbnail(tup): return None return (tup[0], tup[1], b64decode(tup[2])) +def object_to_unicode(obj, enc=preferred_encoding): + + def dec(x): + return x.decode(enc, 'replace') + + if isbytestring(obj): + return dec(obj) + if isinstance(obj, (list, tuple)): + return [dec(x) if isbytestring(x) else x for x in obj] + if isinstance(obj, dict): + ans = {} + for k, v in obj.items(): + k = object_to_unicode(k) + v = object_to_unicode(v) + ans[k] = v + return ans + return obj + class JsonCodec(object): def __init__(self): @@ -81,16 +94,13 @@ class JsonCodec(object): value = book.get(key) if key == 'thumbnail': return encode_thumbnail(value) - elif isinstance(value, str): # str includes bytes + elif isbytestring(value): # str includes bytes enc = filesystem_encoding if key == 'lpath' else preferred_encoding - return value.decode(enc, 'replace') - elif isinstance(value, (list, tuple)): - return [x.decode(preferred_encoding, 'replace') if - isinstance(x, str) else x for x in value] + return object_to_unicode(value, enc=enc) elif datatype == 'datetime': return datetime_to_string(value) else: - return value + return object_to_unicode(value) def decode_from_file(self, file, booklist, book_class, prefix): js = [] @@ -108,7 +118,6 @@ class JsonCodec(object): except: print 'exception during JSON decoding' traceback.print_exc() - booklist = [] def decode_metadata(self, key, value): if key == 'user_metadata': From ea3719c7737b4c4df60840ed0b86bed872e07a6c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 20:52:26 +0100 Subject: [PATCH 022/235] Content server fixes --- src/calibre/library/server/mobile.py | 8 ++++++-- src/calibre/library/server/opds.py | 10 +++++++--- src/calibre/library/server/utils.py | 7 +++++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index 6e08581aed..ab5b39eed8 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -124,6 +124,7 @@ def build_index(books, num, search, sort, order, start, total, url_base, CKEYS): series = u'[%s - %s]'%(book['series'], book['series_index']) \ if book['series'] else '' tags = u'Tags=[%s]'%book['tags'] if book['tags'] else '' + print tags ctext = '' for key in CKEYS: @@ -217,7 +218,8 @@ class MobileServer(object): book['authors'] = authors book['series_index'] = fmt_sidx(float(record[FM['series_index']])) book['series'] = record[FM['series']] - book['tags'] = format_tag_string(record[FM['tags']], ',') + book['tags'] = format_tag_string(record[FM['tags']], ',', + no_tag_count=True) book['title'] = record[FM['title']] for x in ('timestamp', 'pubdate'): book[x] = strftime('%Y/%m/%d %H:%M:%S', record[FM[x]]) @@ -233,7 +235,9 @@ class MobileServer(object): continue name = CFM[key]['name'] if datatype == 'text' and CFM[key]['is_multiple']: - book[key] = concat(name, format_tag_string(val, '|')) + book[key] = concat(name, + format_tag_string(val, '|', + no_tag_count=True)) elif datatype == 'series': book[key] = concat(name, '%s [%s]'%(val, fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index c3a1d68749..e495598a2f 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -17,6 +17,7 @@ import routes from calibre.constants import __appname__ from calibre.ebooks.metadata import fmt_sidx from calibre.library.comments import comments_to_html +from calibre.library.server.utils import format_tag_string from calibre import guess_type from calibre.utils.ordered_dict import OrderedDict from calibre.utils.date import format_date @@ -147,8 +148,9 @@ def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): extra.append(_('RATING: %s
')%rating) tags = item[FM['tags']] if tags: - extra.append(_('TAGS: %s
')%\ - ', '.join(tags.split(','))) + extra.append(_('TAGS: %s
')%format_tag_string(tags, ',', + ignore_max=True, + no_tag_count=True)) series = item[FM['series']] if series: extra.append(_('SERIES: %s [%s]
')%\ @@ -160,7 +162,9 @@ def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): name = CFM[key]['name'] datatype = CFM[key]['datatype'] if datatype == 'text' and CFM[key]['is_multiple']: - extra.append('%s: %s
'%(name, ', '.join(val.split('|')))) + extra.append('%s: %s
'%(name, format_tag_string(val, '|', + ignore_max=True, + no_tag_count=True))) elif datatype == 'series': extra.append('%s: %s [%s]
'%(name, val, fmt_sidx(item[CFM.cc_series_index_column_for(key)]))) diff --git a/src/calibre/library/server/utils.py b/src/calibre/library/server/utils.py index 373653c15f..9a64948a3d 100644 --- a/src/calibre/library/server/utils.py +++ b/src/calibre/library/server/utils.py @@ -44,7 +44,7 @@ def strftime(fmt='%Y/%m/%d %H:%M:%S', dt=None): except: return _strftime(fmt, nowf().timetuple()) -def format_tag_string(tags, sep, ignore_max=False): +def format_tag_string(tags, sep, ignore_max=False, no_tag_count=False): MAX = sys.maxint if ignore_max else tweaks['max_content_server_tags_shown'] if tags: tlist = [t.strip() for t in tags.split(sep)] @@ -53,6 +53,9 @@ def format_tag_string(tags, sep, ignore_max=False): tlist.sort(cmp=lambda x,y:cmp(x.lower(), y.lower())) if len(tlist) > MAX: tlist = tlist[:MAX]+['...'] - return u'%s:&:%s'%(tweaks['max_content_server_tags_shown'], + if no_tag_count: + return ', '.join(tlist) if tlist else '' + else: + return u'%s:&:%s'%(tweaks['max_content_server_tags_shown'], ', '.join(tlist)) if tlist else '' From 240c9428f5da2c5452dd7f0ab6cc8a6c8cd67afe Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 12 Sep 2010 13:57:42 -0600 Subject: [PATCH 023/235] Revert change to how Metadata.thumbnail is interpreted in library.models --- src/calibre/gui2/library/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index b0aec7446a..b81628cd27 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1055,8 +1055,8 @@ class DeviceBooksModel(BooksModel): # {{{ img = QImage() if hasattr(cdata, 'image_path'): img.load(cdata.image_path) - else: - img.loadFromData(cdata[2]) + elif cdata: + img.loadFromData(cdata) if img.isNull(): img = self.default_image data['cover'] = img From 0a2f80fdbff1b5fb541e567a8735ba5b8ca20ffa Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 21:13:35 +0100 Subject: [PATCH 024/235] Merge from trunk --- src/calibre/devices/usbms/books.py | 2 +- src/calibre/ebooks/metadata/book/__init__.py | 2 +- src/calibre/ebooks/metadata/book/base.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 3e13527bd0..4d5110b049 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -59,7 +59,7 @@ class Book(Metadata): return property(doc=doc, fget=fget) @dynamic_property - def thumbnail(self): + def thumbnail(self):' return None class BookList(_BookList): diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index e7f58ce858..84a88606f2 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -110,7 +110,7 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( frozenset(['title', 'title_sort', 'authors', 'author_sort', 'author_sort_map' 'comments', 'cover_data', 'tags', 'language', 'lpath', - 'size']) + 'size', 'thumbnail']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index f52c41e4c5..647a9f467e 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -243,7 +243,7 @@ class Metadata(object): lotags = [t.lower() for t in other.tags] lstags = [t.lower() for t in self.tags] ot, st = map(frozenset, (lotags, lstags)) - for t in st.interection(ot): + for t in st.intersection(ot): sidx = lstags.index(t) oidx = lotags.index(t) self.tags[sidx] = other.tags[oidx] From db4b8d8216bd2299d471be43b114e3e05edf1f26 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 21:15:31 +0100 Subject: [PATCH 025/235] Fix some inadvertent changes --- src/calibre/devices/usbms/books.py | 2 +- src/calibre/ebooks/metadata/book/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 4d5110b049..3e13527bd0 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -59,7 +59,7 @@ class Book(Metadata): return property(doc=doc, fget=fget) @dynamic_property - def thumbnail(self):' + def thumbnail(self): return None class BookList(_BookList): diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index 84a88606f2..e7f58ce858 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -110,7 +110,7 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( frozenset(['title', 'title_sort', 'authors', 'author_sort', 'author_sort_map' 'comments', 'cover_data', 'tags', 'language', 'lpath', - 'size', 'thumbnail']) + 'size']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( From 6ca5263d005a10218008ba74a1a8942ca5c6f74f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 21:36:23 +0100 Subject: [PATCH 026/235] Fix typo, add merge is_multiple --- src/calibre/ebooks/metadata/book/base.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 647a9f467e..f2031afd0e 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -259,7 +259,20 @@ class Metadata(object): for x in other.user_metadata_keys: meta = other.get_user_metadata(x, make_copy=True) if meta is not None: + self_tags = self.get(x, []) self.set_user_metadata(x, meta) # get... did the deepcopy + other_tags = other.get(x, []) + if meta['is_multiple']: + # Case-insensitive but case preserving merging + lotags = [t.lower() for t in other_tags] + lstags = [t.lower() for t in self_tags] + ot, st = map(frozenset, (lotags, lstags)) + for t in st.intersection(ot): + sidx = lstags.index(t) + oidx = lotags.index(t) + self_tags[sidx] = other.tags[oidx] + self_tags += [t for t in other.tags if t.lower() in ot-st] + setattr(self, x, self_tags) my_comments = getattr(self, 'comments', '') other_comments = getattr(other, 'comments', '') if not my_comments: From 8b554ee0cda99dd11c50ba6def1634ca2416396b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 22:04:10 +0100 Subject: [PATCH 027/235] Fixes for thumbnails. --- src/calibre/ebooks/metadata/book/__init__.py | 2 +- src/calibre/ebooks/metadata/book/base.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index e7f58ce858..84a88606f2 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -110,7 +110,7 @@ COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( frozenset(['title', 'title_sort', 'authors', 'author_sort', 'author_sort_map' 'comments', 'cover_data', 'tags', 'language', 'lpath', - 'size']) + 'size', 'thumbnail']) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index f2031afd0e..7812f81180 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -223,7 +223,7 @@ class Metadata(object): self.author_sort = other.author_sort if replace_metadata: - SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments']) + SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail']) for attr in COPYABLE_METADATA_FIELDS: setattr(self, attr, getattr(other, attr, 1.0 if \ attr == 'series_index' else None)) @@ -238,6 +238,7 @@ class Metadata(object): for attr in COPYABLE_METADATA_FIELDS: if hasattr(other, attr): copy_not_none(self, other, attr) + copy_not_none(self, other, 'thumbnail') if other.tags: # Case-insensitive but case preserving merging lotags = [t.lower() for t in other.tags] From 171ac9488aeadfe1b6fd0605c17bbc71662726ed Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 22:32:20 +0100 Subject: [PATCH 028/235] An attempt to make covers work. --- src/calibre/gui2/library/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index b81628cd27..4e8e9a10bd 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1056,7 +1056,10 @@ class DeviceBooksModel(BooksModel): # {{{ if hasattr(cdata, 'image_path'): img.load(cdata.image_path) elif cdata: - img.loadFromData(cdata) + if isinstance(cdata, tuple): + img.loadFromData(cdata[2]) + else: + img.loadFromData(cdata) if img.isNull(): img = self.default_image data['cover'] = img From e73b688ca8ee61b39a65dbfb40d36863b74800f2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 22:44:36 +0100 Subject: [PATCH 029/235] Deal with the two thumbnail formats --- src/calibre/ebooks/metadata/book/json_codec.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index ea0de07342..a6235e64d5 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -12,6 +12,7 @@ from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS from calibre.constants import filesystem_encoding, preferred_encoding from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE +from calibre.utils.magick.draw import identify_data from calibre import isbytestring # Translate datetimes to and from strings. The string form is the datetime in @@ -32,7 +33,12 @@ def encode_thumbnail(thumbnail): ''' if thumbnail is None: return None - return (thumbnail[0], thumbnail[1], b64encode(str(thumbnail[2]))) + if isinstance(thumbnail, tuple): + try: + thumbnail = identify_data(thumbnail) + except: + return None + return (0, 0, b64encode(str(thumbnail))) def decode_thumbnail(tup): ''' From e0261c2ba1e53300275849818df0b78729f99b98 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 12 Sep 2010 22:50:34 +0100 Subject: [PATCH 030/235] This time, do json thumbnails right. --- src/calibre/ebooks/metadata/book/json_codec.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index a6235e64d5..51b9722803 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -12,7 +12,7 @@ from calibre.ebooks.metadata.book import SERIALIZABLE_FIELDS from calibre.constants import filesystem_encoding, preferred_encoding from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE -from calibre.utils.magick.draw import identify_data +from calibre.utils.magick import Image from calibre import isbytestring # Translate datetimes to and from strings. The string form is the datetime in @@ -33,12 +33,15 @@ def encode_thumbnail(thumbnail): ''' if thumbnail is None: return None - if isinstance(thumbnail, tuple): + if not isinstance(thumbnail, tuple): try: - thumbnail = identify_data(thumbnail) + img = Image() + img.load(thumbnail) + width, height = img.size + thumbnail = (width, height, thumbnail) except: return None - return (0, 0, b64encode(str(thumbnail))) + return (thumbnail[0], thumbnail[1], b64encode(str(thumbnail[2]))) def decode_thumbnail(tup): ''' From be95815b6ce234602f1fe6f76a51a3571db06535 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 12 Sep 2010 18:10:52 -0600 Subject: [PATCH 031/235] ... --- src/calibre/gui2/library/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 4e8e9a10bd..09a28fb04e 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1056,8 +1056,8 @@ class DeviceBooksModel(BooksModel): # {{{ if hasattr(cdata, 'image_path'): img.load(cdata.image_path) elif cdata: - if isinstance(cdata, tuple): - img.loadFromData(cdata[2]) + if isinstance(cdata, (tuple, list)): + img.loadFromData(cdata[-1]) else: img.loadFromData(cdata) if img.isNull(): From 43adf4226a6d381cf121ad5871b9237af57c58af Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 13 Sep 2010 08:18:09 +0100 Subject: [PATCH 032/235] Rationalize how smart_update knows what to do. Introduced 2 more metadata groups. One is the list of attributes that smart_update is to process specially. The other is the list of attributes that are to be copied if not none (what you called SPECIAL_FIELDS). These two help keep the replace and merge branches in sync. --- src/calibre/ebooks/metadata/book/__init__.py | 17 ++++++++++----- src/calibre/ebooks/metadata/book/base.py | 23 ++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index 84a88606f2..e087f8072d 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -101,16 +101,23 @@ STANDARD_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( DEVICE_METADATA_FIELDS).union( CALIBRE_METADATA_FIELDS) +# Metadata fields that smart update must do special processing to copy. + +SC_FIELDS_NOT_COPIED = frozenset(['title', 'title_sort', 'authors', + 'author_sort', 'author_sort_map', + 'cover_data', 'tags', 'language']) + +# Metadata fields that smart update should copy only if the source is not None +SC_FIELDS_COPY_NOT_NULL = frozenset(['lpath', 'size', 'comments', 'thumbnail']) + # Metadata fields that smart update should copy without special handling -COPYABLE_METADATA_FIELDS = SOCIAL_METADATA_FIELDS.union( +SC_COPYABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( PUBLICATION_METADATA_FIELDS).union( BOOK_STRUCTURE_FIELDS).union( DEVICE_METADATA_FIELDS).union( CALIBRE_METADATA_FIELDS) - \ - frozenset(['title', 'title_sort', 'authors', - 'author_sort', 'author_sort_map' 'comments', - 'cover_data', 'tags', 'language', 'lpath', - 'size', 'thumbnail']) + SC_FIELDS_NOT_COPIED.union( + SC_FIELDS_COPY_NOT_NULL) SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( USER_METADATA_FIELDS).union( diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 7812f81180..8538ed886c 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -9,7 +9,8 @@ import copy import traceback from calibre import prints -from calibre.ebooks.metadata.book import COPYABLE_METADATA_FIELDS +from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS +from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS from calibre.utils.date import isoformat, format_date @@ -223,22 +224,23 @@ class Metadata(object): self.author_sort = other.author_sort if replace_metadata: - SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail']) - for attr in COPYABLE_METADATA_FIELDS: + # SPECIAL_FIELDS = frozenset(['lpath', 'size', 'comments', 'thumbnail']) + for attr in SC_COPYABLE_FIELDS: setattr(self, attr, getattr(other, attr, 1.0 if \ attr == 'series_index' else None)) self.tags = other.tags self.cover_data = getattr(other, 'cover_data', - NULL_VALUES['cover_data']) + NULL_VALUES['cover_data']) self.set_all_user_metadata(other.get_all_user_metadata(make_copy=True)) - for x in SPECIAL_FIELDS: + for x in SC_FIELDS_COPY_NOT_NULL: copy_not_none(self, other, x) # language is handled below else: - for attr in COPYABLE_METADATA_FIELDS: - if hasattr(other, attr): - copy_not_none(self, other, attr) - copy_not_none(self, other, 'thumbnail') + for attr in SC_COPYABLE_FIELDS: + copy_not_none(self, other, attr) + for x in SC_FIELDS_COPY_NOT_NULL: + copy_not_none(self, other, x) + if other.tags: # Case-insensitive but case preserving merging lotags = [t.lower() for t in other.tags] @@ -249,6 +251,7 @@ class Metadata(object): oidx = lotags.index(t) self.tags[sidx] = other.tags[oidx] self.tags += [t for t in other.tags if t.lower() in ot-st] + if getattr(other, 'cover_data', False): other_cover = other.cover_data[-1] self_cover = self.cover_data[-1] if self.cover_data else '' @@ -256,6 +259,7 @@ class Metadata(object): if not other_cover: other_cover = '' if len(other_cover) > len(self_cover): self.cover_data = other.cover_data + if getattr(other, 'user_metadata_keys', None): for x in other.user_metadata_keys: meta = other.get_user_metadata(x, make_copy=True) @@ -274,6 +278,7 @@ class Metadata(object): self_tags[sidx] = other.tags[oidx] self_tags += [t for t in other.tags if t.lower() in ot-st] setattr(self, x, self_tags) + my_comments = getattr(self, 'comments', '') other_comments = getattr(other, 'comments', '') if not my_comments: From a85be2ba3229f2e27221fb7f64d25a7e48977ab7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 13 Sep 2010 11:59:45 +0100 Subject: [PATCH 033/235] Several changes: 1) allow use of unusual standard fields in get_collections. Format them appropriately 2) change metadata.book.base.format_field to handle standard fields. 3) add standard metadata access methods to metadata.book.base. --- src/calibre/devices/usbms/books.py | 18 +----- src/calibre/ebooks/metadata/book/base.py | 71 +++++++++++++++++++++--- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/field_metadata.py | 17 ++++-- 4 files changed, 76 insertions(+), 32 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 3e13527bd0..2b19027df4 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -105,21 +105,7 @@ class CollectionsBookList(BookList): attr_name = '' elif attr_name != '': attr_name = '(%s)'%attr_name - - if attr not in cust_field_meta: - cat_name = '%s %s'%(category, attr_name) - else: - fm = cust_field_meta[attr] - if fm['datatype'] == 'bool': - if category: - cat_name = '%s %s'%(_('Yes'), attr_name) - else: - cat_name = '%s %s'%(_('No'), attr_name) - elif fm['datatype'] == 'datetime': - cat_name = '%s %s'%(format_date(category, - fm['display'].get('date_format','dd MMM yyyy')), attr_name) - else: - cat_name = '%s %s'%(category, attr_name) + cat_name = '%s %s'%(category, attr_name) return cat_name.strip() def get_collections(self, collection_attributes): @@ -156,7 +142,7 @@ class CollectionsBookList(BookList): cust_field_meta = book.get_all_user_metadata(make_copy=False) for attr in attrs: attr = attr.strip() - val = meta_vals.get(attr, None) + ign, val = book.format_field(attr, ignore_series_index=True) if not val: continue if isbytestring(val): val = val.decode(preferred_encoding, 'replace') diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 8538ed886c..6e0351353f 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -13,6 +13,7 @@ from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS +from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import isoformat, format_date @@ -30,6 +31,8 @@ NULL_VALUES = { 'language' : 'und' } +field_metadata = FieldMetadata() + class Metadata(object): ''' @@ -112,6 +115,31 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') return frozenset(_data['user_metadata'].iterkeys()) + def get_standard_metadata(self, field, make_copy): + ''' + return field metadata from the field if it is there. Otherwise return + None. field is the key name, not the label. Return a copy if requested, + just in case the user wants to change values in the dict. + ''' + if field in field_metadata and field_metadata[field]['kind'] == 'field': + if make_copy: + return copy.deepcopy(field_metadata[field]) + return field_metadata[field] + return None + + def get_all_standard_metadata(self, make_copy): + ''' + return a dict containing all the standard field metadata associated with + the book. + ''' + if not make_copy: + return field_metadata + res = {} + for k in field_metadata: + if field_metadata[k]['kind'] == 'field': + res[k] = copy.deepcopy(field_metadata[k]) + return res + def get_all_user_metadata(self, make_copy): ''' return a dict containing all the custom field metadata associated with @@ -315,24 +343,49 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) - def format_custom_field(self, key): + def format_field(self, key, ignore_series_index=False): + from calibre.ebooks.metadata import authors_to_string ''' returns the tuple (field_name, formatted_value) ''' - cmeta = self.get_user_metadata(key, make_copy=False) - name = unicode(cmeta['name']) - res = self.get(key, None) - if res is not None: + if key in self.user_metadata_keys: + res = self.get(key, None) + if res is None or res == '': + return (None, None) + cmeta = self.get_user_metadata(key, make_copy=False) + name = unicode(cmeta['name']) datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: res = u', '.join(res) elif datatype == 'series': - res = res + ' [%s]'%self.format_series_index(val=self.get_extra(key)) + if not ignore_series_index: + res = res + \ + ' [%s]'%self.format_series_index(val=self.get_extra(key)) elif datatype == 'datetime': res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') - return (name, unicode(res)) + return (name, unicode(res)) + + if key in field_metadata and field_metadata[key]['kind'] == 'field': + res = self.get(key, None) + if res is None or res == '': + return (None, None) + fmeta = field_metadata[key] + name = unicode(fmeta['name']) + datatype = fmeta['datatype'] + if key == 'authors': + res = authors_to_string(res) + elif datatype == 'text' and fmeta['is_multiple']: + res = u', '.join(res) + elif datatype == 'series': + if not ignore_series_index: + res = res + ' [%s]'%self.format_series_index() + elif datatype == 'datetime': + res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) + return (name, unicode(res)) + + return (None, None) def __unicode__(self): from calibre.ebooks.metadata import authors_to_string @@ -371,7 +424,7 @@ class Metadata(object): for key in self.user_metadata_keys: val = self.get(key, None) if val is not None: - (name, val) = self.format_custom_field(key) + (name, val) = self.format_field(key) fmt(name, unicode(val)) return u'\n'.join(ans) @@ -396,7 +449,7 @@ class Metadata(object): for key in self.user_metadata_keys: val = self.get(key, None) if val is not None: - (name, val) = self.format_custom_field(key) + (name, val) = self.format_field(key) ans += [(name, val)] for i, x in enumerate(ans): ans[i] = u'%s%s'%x diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 09a28fb04e..5fa514ae8a 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -320,7 +320,7 @@ class BooksModel(QAbstractTableModel): # {{{ (sidx, prepare_string_for_xml(series)) mi = self.db.get_metadata(idx) for key in mi.user_metadata_keys: - name, val = mi.format_custom_field(key) + name, val = mi.format_field(key) if val is not None: data[name] = val return data diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index 276a6ba971..2773f573b2 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -5,6 +5,7 @@ Created on 25 May 2010 ''' from calibre.utils.ordered_dict import OrderedDict +from calibre.utils.config import tweaks class TagsIcons(dict): ''' @@ -213,7 +214,7 @@ class FieldMetadata(dict): 'datatype':'text', 'is_multiple':None, 'kind':'field', - 'name':None, + 'name':_('On Device'), 'search_terms':['ondevice'], 'is_custom':False, 'is_category':False}), @@ -231,7 +232,7 @@ class FieldMetadata(dict): 'datatype':'datetime', 'is_multiple':None, 'kind':'field', - 'name':None, + 'name':_('Published'), 'search_terms':['pubdate'], 'is_custom':False, 'is_category':False}), @@ -258,7 +259,7 @@ class FieldMetadata(dict): 'datatype':'float', 'is_multiple':None, 'kind':'field', - 'name':None, + 'name':_('Size (MB)'), 'search_terms':['size'], 'is_custom':False, 'is_category':False}), @@ -267,7 +268,7 @@ class FieldMetadata(dict): 'datatype':'datetime', 'is_multiple':None, 'kind':'field', - 'name':None, + 'name':_('Date'), 'search_terms':['date'], 'is_custom':False, 'is_category':False}), @@ -276,7 +277,7 @@ class FieldMetadata(dict): 'datatype':'text', 'is_multiple':None, 'kind':'field', - 'name':None, + 'name':_('Title'), 'search_terms':['title'], 'is_custom':False, 'is_category':False}), @@ -310,6 +311,10 @@ class FieldMetadata(dict): self._tb_cats[k]['display'] = {} self._tb_cats[k]['is_editable'] = True self._add_search_terms_to_map(k, v['search_terms']) + self._tb_cats['timestamp']['display'] = { + 'date_format': tweaks['gui_timestamp_display_format']} + self._tb_cats['pubdate']['display'] = { + 'date_format': tweaks['gui_pubdate_display_format']} self.custom_field_prefix = '#' self.get = self._tb_cats.get @@ -410,7 +415,7 @@ class FieldMetadata(dict): if datatype == 'series': key += '_index' self._tb_cats[key] = {'table':None, 'column':None, - 'datatype':'float', 'is_multiple':False, + 'datatype':'float', 'is_multiple':None, 'kind':'field', 'name':'', 'search_terms':[key], 'label':label+'_index', 'colnum':None, 'display':{}, From 2a654f3062401e864cdd357850033ad05937f34e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 14 Sep 2010 07:41:06 +0100 Subject: [PATCH 034/235] Fix stupidity in collectiions_management where I broke tag splitting --- src/calibre/devices/usbms/books.py | 4 +++- src/calibre/ebooks/metadata/book/base.py | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index cf60f1311c..d25787fc89 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -141,7 +141,9 @@ class CollectionsBookList(BookList): cust_field_meta = book.get_all_user_metadata(make_copy=False) for attr in attrs: attr = attr.strip() - ign, val = book.format_field(attr, ignore_series_index=True) + ign, val = book.format_field(attr, + ignore_series_index=True, + return_multiples_as_list=True) if not val: continue if isbytestring(val): val = val.decode(preferred_encoding, 'replace') diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 6e0351353f..7405f20a7c 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -343,7 +343,8 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) - def format_field(self, key, ignore_series_index=False): + def format_field(self, key, ignore_series_index=False, + return_multiples_as_list=False): from calibre.ebooks.metadata import authors_to_string ''' returns the tuple (field_name, formatted_value) @@ -356,7 +357,8 @@ class Metadata(object): name = unicode(cmeta['name']) datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: - res = u', '.join(res) + if not return_multiples_as_list: + res = u', '.join(res) elif datatype == 'series': if not ignore_series_index: res = res + \ @@ -365,7 +367,7 @@ class Metadata(object): res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') - return (name, unicode(res)) + return (name, res) if key in field_metadata and field_metadata[key]['kind'] == 'field': res = self.get(key, None) @@ -377,13 +379,14 @@ class Metadata(object): if key == 'authors': res = authors_to_string(res) elif datatype == 'text' and fmeta['is_multiple']: - res = u', '.join(res) + if not return_multiples_as_list: + res = u', '.join(res) elif datatype == 'series': if not ignore_series_index: res = res + ' [%s]'%self.format_series_index() elif datatype == 'datetime': res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) - return (name, unicode(res)) + return (name, res) return (None, None) From 6653fff4cd3228629c879e0e534024a9cc203fd2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Sep 2010 21:20:55 -0600 Subject: [PATCH 035/235] OPF serialization of user metadata --- .../ebooks/metadata/book/json_codec.py | 2 +- src/calibre/ebooks/metadata/opf2.py | 108 ++++++++++++++++-- 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 51b9722803..2550089473 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -33,7 +33,7 @@ def encode_thumbnail(thumbnail): ''' if thumbnail is None: return None - if not isinstance(thumbnail, tuple): + if not isinstance(thumbnail, (tuple, list)): try: img = Image() img.load(thumbnail) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index be8507f478..236b2fa18f 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en' lxml based OPF parser. ''' -import re, sys, unittest, functools, os, mimetypes, uuid, glob, cStringIO +import re, sys, unittest, functools, os, mimetypes, uuid, glob, cStringIO, json from urllib import unquote from urlparse import urlparse @@ -20,8 +20,9 @@ from calibre.ebooks.metadata import string_to_authors, MetaInformation from calibre.ebooks.metadata.book.base import Metadata from calibre.utils.date import parse_date, isoformat from calibre.utils.localization import get_lang +from calibre import prints -class Resource(object): +class Resource(object): # {{{ ''' Represents a resource (usually a file on the filesystem or a URL pointing to the web. Such resources are commonly referred to in OPF files. @@ -102,8 +103,9 @@ class Resource(object): def __repr__(self): return 'Resource(%s, %s)'%(repr(self.path), repr(self.href())) +# }}} -class ResourceCollection(object): +class ResourceCollection(object): # {{{ def __init__(self): self._resources = [] @@ -154,10 +156,9 @@ class ResourceCollection(object): for res in self: res.set_basedir(path) +# }}} - - -class ManifestItem(Resource): +class ManifestItem(Resource): # {{{ @staticmethod def from_opf_manifest_item(item, basedir): @@ -195,8 +196,9 @@ class ManifestItem(Resource): return self.media_type raise IndexError('%d out of bounds.'%index) +# }}} -class Manifest(ResourceCollection): +class Manifest(ResourceCollection): # {{{ @staticmethod def from_opf_manifest_element(items, dir): @@ -263,7 +265,9 @@ class Manifest(ResourceCollection): if i.id == id: return i.mime_type -class Spine(ResourceCollection): +# }}} + +class Spine(ResourceCollection): # {{{ class Item(Resource): @@ -335,7 +339,9 @@ class Spine(ResourceCollection): for i in self: yield i.path -class Guide(ResourceCollection): +# }}} + +class Guide(ResourceCollection): # {{{ class Reference(Resource): @@ -372,6 +378,7 @@ class Guide(ResourceCollection): self[-1].type = type self[-1].title = '' +# }}} class MetadataField(object): @@ -413,7 +420,29 @@ class MetadataField(object): elem = obj.create_metadata_element(self.name, is_dc=self.is_dc) obj.set_text(elem, unicode(val)) -class OPF(object): + +def serialize_user_metadata(metadata_elem, all_user_metadata, tail='\n'+(' '*8)): + from calibre.utils.config import to_json + from calibre.ebooks.metadata.book.json_codec import object_to_unicode + + for name, fm in all_user_metadata.items(): + try: + fm = object_to_unicode(fm) + fm = json.dumps(fm, default=to_json, ensure_ascii=False) + except: + prints('Failed to write user metadata:', name) + import traceback + traceback.print_exc() + continue + meta = metadata_elem.makeelement('meta') + meta.set('name', 'calibre:user_metadata:'+name) + meta.set('content', fm) + meta.tail = tail + metadata_elem.append(meta) + + +class OPF(object): # {{{ + MIMETYPE = 'application/oebps-package+xml' PARSER = etree.XMLParser(recover=True) NAMESPACES = { @@ -498,6 +527,34 @@ class OPF(object): self.guide = Guide.from_opf_guide(guide, basedir) if guide else None self.cover_data = (None, None) self.find_toc() + self.read_user_metadata() + + def read_user_metadata(self): + self.user_metadata = {} + from calibre.utils.config import from_json + elems = self.root.xpath('//*[name() = "meta" and starts-with(@name,' + '"calibre:user_metadata:") and @content]') + for elem in elems: + name = elem.get('name') + name = ':'.join(name.split(':')[2:]) + if not name or not name.startswith('#'): + continue + fm = elem.get('content') + try: + fm = json.loads(fm, object_hook=from_json) + except: + prints('Failed to read user metadata:', name) + import traceback + traceback.print_exc() + continue + self.user_metadata[name] = fm + + + def write_user_metadata(self): + for elem in self.user_metadata_path(self.root): + elem.getparent().remove(elem) + serialize_user_metadata(self.metadata, + self.user_metadata) def find_toc(self): self.toc = None @@ -912,6 +969,7 @@ class OPF(object): return elem def render(self, encoding='utf-8'): + self.write_user_metadata() raw = etree.tostring(self.root, encoding=encoding, pretty_print=True) if not raw.lstrip().startswith('\n'%encoding.upper()+raw @@ -926,6 +984,7 @@ class OPF(object): if val is not None and val != [] and val != (None, None): setattr(self, attr, val) +# }}} class OPFCreator(Metadata): @@ -1116,6 +1175,8 @@ class OPFCreator(Metadata): item.set('title', ref.title) guide.append(item) + serialize_user_metadata(metadata, self.get_all_user_metadata(False)) + root = E.package( metadata, manifest, @@ -1218,6 +1279,8 @@ def metadata_to_opf(mi, as_string=True): if mi.title_sort: meta('title_sort', mi.title_sort) + serialize_user_metadata(metadata, mi.get_all_user_metadata(False)) + metadata[-1].tail = '\n' +(' '*4) if mi.cover: @@ -1335,5 +1398,28 @@ def suite(): def test(): unittest.TextTestRunner(verbosity=2).run(suite()) +def test_user_metadata(): + from cStringIO import StringIO + mi = Metadata('Test title', ['test author1', 'test author2']) + um = { + '#myseries': { '#value#': u'test series\xe4', 'datatype':'text', + 'is_multiple': False, 'name': u'My Series'}, + '#myseries_index': { '#value#': 2.45, 'datatype': 'float', + 'is_multiple': False} + } + mi.set_all_user_metadata(um) + raw = metadata_to_opf(mi) + opfc = OPFCreator(os.getcwd(), other=mi) + out = StringIO() + opfc.render(out) + raw2 = out.getvalue() + f = StringIO(raw) + opf = OPF(f) + f2 = StringIO(raw2) + opf2 = OPF(f2) + assert um == opf.user_metadata + assert um == opf2.user_metadata + print raw + if __name__ == '__main__': - test() + test_user_metadata() From 420db7851b8650ae7e61f2b441b9a7822dddbd8b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Sep 2010 21:50:06 -0600 Subject: [PATCH 036/235] Fix use of OPF class to generate a Metadata object and have OPF.smart_update also update user metadata --- src/calibre/customize/builtins.py | 3 +-- src/calibre/ebooks/conversion/plumber.py | 2 +- src/calibre/ebooks/metadata/cli.py | 2 +- src/calibre/ebooks/metadata/epub.py | 2 +- src/calibre/ebooks/metadata/lit.py | 3 +-- src/calibre/ebooks/metadata/meta.py | 2 +- src/calibre/ebooks/metadata/opf2.py | 24 +++++++++++++++++------- src/calibre/ebooks/mobi/reader.py | 2 +- src/calibre/ebooks/oeb/reader.py | 3 +-- src/calibre/gui2/add.py | 2 +- src/calibre/library/cli.py | 2 +- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 68df832048..1ddb2843a1 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -226,8 +226,7 @@ class OPFMetadataReader(MetadataReaderPlugin): def get_metadata(self, stream, ftype): from calibre.ebooks.metadata.opf2 import OPF - from calibre.ebooks.metadata import MetaInformation - return MetaInformation(OPF(stream, os.getcwd())) + return OPF(stream, os.getcwd()).to_book_metadata() class PDBMetadataReader(MetadataReaderPlugin): diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 16282dd28d..38e47f6bf7 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -692,7 +692,7 @@ OptionRecommendation(name='timestamp', self.opts.read_metadata_from_opf) opf = OPF(open(self.opts.read_metadata_from_opf, 'rb'), os.path.dirname(self.opts.read_metadata_from_opf)) - mi = MetaInformation(opf) + mi = opf.to_book_metadata() self.opts_to_mi(mi) if mi.cover: if mi.cover.startswith('http:') or mi.cover.startswith('https:'): diff --git a/src/calibre/ebooks/metadata/cli.py b/src/calibre/ebooks/metadata/cli.py index 780d3febcf..a0be187512 100644 --- a/src/calibre/ebooks/metadata/cli.py +++ b/src/calibre/ebooks/metadata/cli.py @@ -109,7 +109,7 @@ def do_set_metadata(opts, mi, stream, stream_type): from_opf = getattr(opts, 'from_opf', None) if from_opf is not None: from calibre.ebooks.metadata.opf2 import OPF - opf_mi = MetaInformation(OPF(open(from_opf, 'rb'))) + opf_mi = OPF(open(from_opf, 'rb')).to_book_metadata() mi.smart_update(opf_mi) for pref in config().option_set.preferences: diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py index ac6b5feebe..8984a252a3 100644 --- a/src/calibre/ebooks/metadata/epub.py +++ b/src/calibre/ebooks/metadata/epub.py @@ -167,7 +167,7 @@ def get_metadata(stream, extract_cover=True): """ Return metadata as a :class:`Metadata` object """ stream.seek(0) reader = OCFZipReader(stream) - mi = MetaInformation(reader.opf) + mi = reader.opf.to_book_metadata() if extract_cover: try: cdata = get_cover(reader.opf, reader.opf_path, stream, reader=reader) diff --git a/src/calibre/ebooks/metadata/lit.py b/src/calibre/ebooks/metadata/lit.py index 1a267b6858..3be1f22632 100644 --- a/src/calibre/ebooks/metadata/lit.py +++ b/src/calibre/ebooks/metadata/lit.py @@ -6,7 +6,6 @@ Support for reading the metadata from a LIT file. import cStringIO, os -from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.metadata.opf2 import OPF def get_metadata(stream): @@ -16,7 +15,7 @@ def get_metadata(stream): src = litfile.get_metadata().encode('utf-8') litfile = litfile._litfile opf = OPF(cStringIO.StringIO(src), os.getcwd()) - mi = MetaInformation(opf) + mi = opf.to_book_metadata() covers = [] for item in opf.iterguide(): if 'cover' not in item.get('type', '').lower(): diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py index eae8171362..68deca5e10 100644 --- a/src/calibre/ebooks/metadata/meta.py +++ b/src/calibre/ebooks/metadata/meta.py @@ -194,7 +194,7 @@ def opf_metadata(opfpath): try: opf = OPF(f, os.path.dirname(opfpath)) if opf.application_id is not None: - mi = MetaInformation(opf) + mi = opf.to_book_metadata() if hasattr(opf, 'cover') and opf.cover: cpath = os.path.join(os.path.dirname(opfpath), opf.cover) if os.access(cpath, os.R_OK): diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 236b2fa18f..96f1fa4832 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -530,7 +530,7 @@ class OPF(object): # {{{ self.read_user_metadata() def read_user_metadata(self): - self.user_metadata = {} + self._user_metadata_ = {} from calibre.utils.config import from_json elems = self.root.xpath('//*[name() = "meta" and starts-with(@name,' '"calibre:user_metadata:") and @content]') @@ -547,14 +547,21 @@ class OPF(object): # {{{ import traceback traceback.print_exc() continue - self.user_metadata[name] = fm + self._user_metadata_[name] = fm + def to_book_metadata(self): + ans = MetaInformation(self) + for n, v in self._user_metadata_.items(): + ans.set_user_metadata(n, v) + return ans def write_user_metadata(self): - for elem in self.user_metadata_path(self.root): + elems = self.root.xpath('//*[name() = "meta" and starts-with(@name,' + '"calibre:user_metadata:") and @content]') + for elem in elems: elem.getparent().remove(elem) serialize_user_metadata(self.metadata, - self.user_metadata) + self._user_metadata_) def find_toc(self): self.toc = None @@ -983,6 +990,9 @@ class OPF(object): # {{{ val = getattr(mi, attr, None) if val is not None and val != [] and val != (None, None): setattr(self, attr, val) + temp = self.to_book_metadata() + temp.smart_update(mi, replace_metadata=replace_metadata) + self._user_metadata_ = temp.get_all_user_metadata(True) # }}} @@ -1417,9 +1427,9 @@ def test_user_metadata(): opf = OPF(f) f2 = StringIO(raw2) opf2 = OPF(f2) - assert um == opf.user_metadata - assert um == opf2.user_metadata - print raw + assert um == opf._user_metadata_ + assert um == opf2._user_metadata_ + print opf.render() if __name__ == '__main__': test_user_metadata() diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py index 2a35c7cb45..6a44c2aa77 100644 --- a/src/calibre/ebooks/mobi/reader.py +++ b/src/calibre/ebooks/mobi/reader.py @@ -441,7 +441,7 @@ class MobiReader(object): html.tostring(elem, encoding='utf-8') + '' stream = cStringIO.StringIO(raw) opf = OPF(stream) - self.embedded_mi = MetaInformation(opf) + self.embedded_mi = opf.to_book_metadata() if guide is not None: for ref in guide.xpath('descendant::reference'): if 'cover' in ref.get('type', '').lower(): diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py index d7d7bbf725..559421326c 100644 --- a/src/calibre/ebooks/oeb/reader.py +++ b/src/calibre/ebooks/oeb/reader.py @@ -126,10 +126,9 @@ class OEBReader(object): def _metadata_from_opf(self, opf): from calibre.ebooks.metadata.opf2 import OPF - from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.oeb.transforms.metadata import meta_info_to_oeb_metadata stream = cStringIO.StringIO(etree.tostring(opf)) - mi = MetaInformation(OPF(stream)) + mi = OPF(stream).to_book_metadata() if not mi.language: mi.language = get_lang().replace('_', '-') self.oeb.metadata.add('language', mi.language) diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 5b9fb35be3..9f246aeb93 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -138,7 +138,7 @@ class DBAdder(Thread): # {{{ self.critical[name] = open(opf, 'rb').read().decode('utf-8', 'replace') else: try: - mi = MetaInformation(OPF(opf)) + mi = OPF(opf).to_book_metadata() except: import traceback mi = MetaInformation('', [_('Unknown')]) diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index 9a2d0b0a62..cd4e472807 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -448,7 +448,7 @@ def command_show_metadata(args, dbpath): return 0 def do_set_metadata(db, id, stream): - mi = OPF(stream) + mi = OPF(stream).to_book_metadata() db.set_metadata(id, mi) db.clean() do_show_metadata(db, id, False) From 4bc7aa1b710e00bdefdd82bed915c8a977b2523e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Sep 2010 21:56:02 -0600 Subject: [PATCH 037/235] More robust reading of user metadata from OPF --- src/calibre/ebooks/metadata/opf2.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 96f1fa4832..ecbef3194d 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -531,6 +531,7 @@ class OPF(object): # {{{ def read_user_metadata(self): self._user_metadata_ = {} + temp = Metadata('x', ['x']) from calibre.utils.config import from_json elems = self.root.xpath('//*[name() = "meta" and starts-with(@name,' '"calibre:user_metadata:") and @content]') @@ -542,12 +543,13 @@ class OPF(object): # {{{ fm = elem.get('content') try: fm = json.loads(fm, object_hook=from_json) + temp.set_user_metadata(name, fm) except: prints('Failed to read user metadata:', name) import traceback traceback.print_exc() continue - self._user_metadata_[name] = fm + self._user_metadata_ = temp.get_all_user_metadata(True) def to_book_metadata(self): ans = MetaInformation(self) From 56023722709d35816424cd3c77f5afe972103d0c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 16 Sep 2010 12:24:56 +0100 Subject: [PATCH 038/235] Minor changes to OPF testing --- src/calibre/ebooks/metadata/opf2.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index ecbef3194d..8a4ff6a5bd 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -1415,9 +1415,11 @@ def test_user_metadata(): mi = Metadata('Test title', ['test author1', 'test author2']) um = { '#myseries': { '#value#': u'test series\xe4', 'datatype':'text', - 'is_multiple': False, 'name': u'My Series'}, + 'is_multiple': None, 'name': u'My Series'}, '#myseries_index': { '#value#': 2.45, 'datatype': 'float', - 'is_multiple': False} + 'is_multiple': None}, + '#mytags': {'#value#':['t1','t2','t3'], 'datatype':'text', + 'is_multiple': '|', 'name': u'My Tags'} } mi.set_all_user_metadata(um) raw = metadata_to_opf(mi) From e1dd08acef1b14c73a3da542f974acd9a10a1f79 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 16 Sep 2010 14:02:49 +0100 Subject: [PATCH 039/235] Several changes: 1) Add an option to specify the time format when sending to device. This is the analog of the same option that already exists for save to disk. 2) refactor the format_field code. Remove the special parameters on format_field. Add format_field_extended that returns a 4-element tuple (name, formatted val, original val, field metadata). 3) change (simplify) usbms collections management to use new format_field_extended method. 4) change device.py to not call sync_booklists twice. 5) add the fix for gui-not-updating, in hopes that we can avoid merge conflicts --- src/calibre/devices/usbms/books.py | 21 +++++++-------- src/calibre/devices/usbms/device.py | 4 ++- src/calibre/ebooks/metadata/book/base.py | 33 ++++++++++++------------ src/calibre/gui2/actions/add.py | 2 +- src/calibre/gui2/device.py | 28 ++++++++++++-------- src/calibre/gui2/preferences/sending.py | 3 +++ src/calibre/gui2/preferences/sending.ui | 15 ++++++++++- src/calibre/library/save_to_disk.py | 3 +++ 8 files changed, 68 insertions(+), 41 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index d25787fc89..eab625f7be 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -94,12 +94,12 @@ class CollectionsBookList(BookList): def supports_collections(self): return True - def compute_category_name(self, attr, category, cust_field_meta): + def compute_category_name(self, attr, category, field_meta): renames = tweaks['sony_collection_renaming_rules'] attr_name = renames.get(attr, None) if attr_name is None: - if attr in cust_field_meta: - attr_name = '(%s)'%cust_field_meta[attr]['name'] + if field_meta['is_custom']: + attr_name = '(%s)'%field_meta['name'] else: attr_name = '' elif attr_name != '': @@ -138,23 +138,23 @@ class CollectionsBookList(BookList): # specified 'on_connect' attrs = collection_attributes meta_vals = book.get_all_non_none_attributes() - cust_field_meta = book.get_all_user_metadata(make_copy=False) for attr in attrs: attr = attr.strip() - ign, val = book.format_field(attr, - ignore_series_index=True, - return_multiples_as_list=True) + ign, val, orig_val, fm = book.format_field_extended(attr) if not val: continue if isbytestring(val): val = val.decode(preferred_encoding, 'replace') if isinstance(val, (list, tuple)): val = list(val) + elif fm['datatype'] == 'series': + val = [orig_val] + elif fm['datatype'] == 'text' and fm['is_multiple']: + val = orig_val else: val = [val] for category in val: is_series = False - if attr in cust_field_meta: # is a custom field - fm = cust_field_meta[attr] + if fm['is_custom']: # is a custom field if fm['datatype'] == 'text' and len(category) > 1 and \ category[0] == '[' and category[-1] == ']': continue @@ -168,8 +168,7 @@ class CollectionsBookList(BookList): ('series' in collection_attributes and meta_vals.get('series', None) == category): is_series = True - cat_name = self.compute_category_name(attr, category, - cust_field_meta) + cat_name = self.compute_category_name(attr, category, fm) if cat_name not in collections: collections[cat_name] = [] collections_lpaths[cat_name] = set() diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index b954911242..928d00ad4a 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -829,12 +829,14 @@ class Device(DeviceConfig, DevicePlugin): ext = os.path.splitext(fname)[1] from calibre.library.save_to_disk import get_components + from calibre.library.save_to_disk import config + opts = config().parse() if not isinstance(template, unicode): template = template.decode('utf-8') app_id = str(getattr(mdata, 'application_id', '')) # The db id will be in the created filename extra_components = get_components(template, mdata, fname, - length=250-len(app_id)-1) + timefmt=opts.send_timefmt, length=250-len(app_id)-1) if not extra_components: extra_components.append(sanitize(self.filename_callback(fname, mdata))) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 7405f20a7c..b252f518da 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -343,8 +343,11 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) - def format_field(self, key, ignore_series_index=False, - return_multiples_as_list=False): + def format_field(self, key): + name, val, ign, ign = self.format_field_extended(key) + return (name, val) + + def format_field_extended(self, key): from calibre.ebooks.metadata import authors_to_string ''' returns the tuple (field_name, formatted_value) @@ -352,43 +355,41 @@ class Metadata(object): if key in self.user_metadata_keys: res = self.get(key, None) if res is None or res == '': - return (None, None) + return (None, None, None, None) + orig_res = res cmeta = self.get_user_metadata(key, make_copy=False) name = unicode(cmeta['name']) datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: - if not return_multiples_as_list: - res = u', '.join(res) + res = u', '.join(res) elif datatype == 'series': - if not ignore_series_index: - res = res + \ - ' [%s]'%self.format_series_index(val=self.get_extra(key)) + res = res + \ + ' [%s]'%self.format_series_index(val=self.get_extra(key)) elif datatype == 'datetime': res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') - return (name, res) + return (name, res, orig_res, cmeta) if key in field_metadata and field_metadata[key]['kind'] == 'field': res = self.get(key, None) if res is None or res == '': - return (None, None) + return (None, None, None, None) + orig_res = res fmeta = field_metadata[key] name = unicode(fmeta['name']) datatype = fmeta['datatype'] if key == 'authors': res = authors_to_string(res) elif datatype == 'text' and fmeta['is_multiple']: - if not return_multiples_as_list: - res = u', '.join(res) + res = u', '.join(res) elif datatype == 'series': - if not ignore_series_index: - res = res + ' [%s]'%self.format_series_index() + res = res + ' [%s]'%self.format_series_index() elif datatype == 'datetime': res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) - return (name, res) + return (name, res, orig_res, fmeta) - return (None, None) + return (None, None, None, None) def __unicode__(self): from calibre.ebooks.metadata import authors_to_string diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index add7bf1d5b..aa20b8bc16 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -230,7 +230,7 @@ class AddAction(InterfaceAction): self._files_added(paths, names, infos, on_card=on_card) # set the in-library flags, and as a consequence send the library's # metadata for this book to the device. This sets the uuid to the - # correct value. + # correct value. Note that set_books_in_library might sync_booklists self.gui.set_books_in_library(booklists=[model.db], reset=True) model.reset() diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index f839e1d519..196e97f2a3 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -745,6 +745,7 @@ class DeviceMixin(object): # {{{ if job.failed: self.device_job_exception(job) return + # set_books_in_library might schedule a sync_booklists job self.set_books_in_library(job.result, reset=True) mainlist, cardalist, cardblist = job.result self.memory_view.set_database(mainlist) @@ -789,11 +790,12 @@ class DeviceMixin(object): # {{{ self.device_manager.remove_books_from_metadata(paths, self.booklists()) model.paths_deleted(paths) - self.upload_booklists() # Force recomputation the library's ondevice info. We need to call # set_books_in_library even though books were not added because - # the deleted book might have been an exact match. - self.set_books_in_library(self.booklists(), reset=True) + # the deleted book might have been an exact match. Upload the booklists + # if set_books_in_library did not. + if not self.set_books_in_library(self.booklists(), reset=True): + self.upload_booklists() self.book_on_device(None, None, reset=True) # We need to reset the ondevice flags in the library. Use a big hammer, # so we don't need to worry about whether some succeeded or not. @@ -1280,8 +1282,6 @@ class DeviceMixin(object): # {{{ self.device_manager.add_books_to_metadata(job.result, metadata, self.booklists()) - self.upload_booklists() - books_to_be_deleted = [] if memory and memory[1]: books_to_be_deleted = memory[1] @@ -1291,12 +1291,15 @@ class DeviceMixin(object): # {{{ # book already there with a different book. This happens frequently in # news. When this happens, the book match indication will be wrong # because the UUID changed. Force both the device and the library view - # to refresh the flags. - self.set_books_in_library(self.booklists(), reset=True) + # to refresh the flags. Set_books_in_library could upload the booklists. + # If it does not, then do it here. + if not self.set_books_in_library(self.booklists(), reset=True): + self.upload_booklists() self.book_on_device(None, reset=True) self.refresh_ondevice_info(device_connected = True) - view = self.card_a_view if on_card == 'carda' else self.card_b_view if on_card == 'cardb' else self.memory_view + view = self.card_a_view if on_card == 'carda' else \ + self.card_b_view if on_card == 'cardb' else self.memory_view view.model().resort(reset=False) view.model().research() for f in files: @@ -1371,7 +1374,7 @@ class DeviceMixin(object): # {{{ try: db = self.library_view.model().db except: - return + return False # Build a cache (map) of the library, so the search isn't On**2 self.db_book_title_cache = {} self.db_book_uuid_cache = {} @@ -1466,10 +1469,13 @@ class DeviceMixin(object): # {{{ # Set author_sort if it isn't already asort = getattr(book, 'author_sort', None) if not asort and book.authors: - book.author_sort = self.library_view.model().db.author_sort_from_authors(book.authors) + book.author_sort = self.library_view.model().db.\ + author_sort_from_authors(book.authors) if update_metadata: if self.device_manager.is_device_connected: - self.device_manager.sync_booklists(None, booklists) + self.device_manager.sync_booklists( + Dispatcher(self.metadata_synced), booklists) + return update_metadata # }}} diff --git a/src/calibre/gui2/preferences/sending.py b/src/calibre/gui2/preferences/sending.py index 748c6b2a2d..ac4abbcf41 100644 --- a/src/calibre/gui2/preferences/sending.py +++ b/src/calibre/gui2/preferences/sending.py @@ -22,6 +22,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): r = self.register + for x in ('send_timefmt',): + r(x, self.proxy) + choices = [(_('Manual management'), 'manual'), (_('Only on send'), 'on_send'), (_('Automatic management'), 'on_connect')] diff --git a/src/calibre/gui2/preferences/sending.ui b/src/calibre/gui2/preferences/sending.ui index e064646afd..b9d1d1e1d2 100644 --- a/src/calibre/gui2/preferences/sending.ui +++ b/src/calibre/gui2/preferences/sending.ui @@ -80,7 +80,20 @@ - + + + + Format &dates as: + + + opt_send_timefmt + + + + + + + Here you can control how calibre will save your books when you click the Send to Device button. This setting can be overriden for individual devices by customizing the device interface plugins in Preferences->Advanced->Plugins diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 3fa40c68b2..71850abcd5 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -84,6 +84,9 @@ def config(defaults=None): x('timefmt', default='%b, %Y', help=_('The format in which to display dates. %d - day, %b - month, ' '%Y - year. Default is: %b, %Y')) + x('send_timefmt', default='%b, %Y', + help=_('The format in which to display dates. %d - day, %b - month, ' + '%Y - year. Default is: %b, %Y')) x('to_lowercase', default=False, help=_('Convert paths to lowercase.')) x('replace_whitespace', default=False, From 4645138a67193537ba3e91fc3e4942017d72e1de Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 16 Sep 2010 16:03:07 +0100 Subject: [PATCH 040/235] 1) Re-enable syntactic validation of save templates. 2) fix row numbering on send_to_device preferences ui template. --- src/calibre/gui2/preferences/save_template.py | 37 +++++++++++-------- src/calibre/gui2/preferences/sending.ui | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/calibre/gui2/preferences/save_template.py b/src/calibre/gui2/preferences/save_template.py index 26dc02f259..0dbee5bf21 100644 --- a/src/calibre/gui2/preferences/save_template.py +++ b/src/calibre/gui2/preferences/save_template.py @@ -8,8 +8,10 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import QWidget, pyqtSignal +from calibre.gui2 import error_dialog from calibre.gui2.preferences.save_template_ui import Ui_Form -from calibre.library.save_to_disk import FORMAT_ARG_DESCS +from calibre.library.save_to_disk import FORMAT_ARG_DESCS, preprocess_template,\ + safe_format class SaveTemplate(QWidget, Ui_Form): @@ -24,8 +26,11 @@ class SaveTemplate(QWidget, Ui_Form): variables = sorted(FORMAT_ARG_DESCS.keys()) rows = [] for var in variables: - rows.append(u'%s%s'% + rows.append(u'%s %s'% (var, FORMAT_ARG_DESCS[var])) + rows.append(u'%s  %s'%( + _('Any custom field'), + _('The lookup name of any custom field. These names begin with "#")'))) table = u'%s
'%(u'\n'.join(rows)) self.template_variables.setText(table) @@ -39,21 +44,21 @@ class SaveTemplate(QWidget, Ui_Form): self.changed_signal.emit() def validate(self): - # TODO: NEWMETA: I haven't figured out how to get the custom columns - # into here, so for the moment make all templates valid. + ''' + Do a syntax check on the format string. Doing a semantic check + (verifying that the fields exist) is not useful in the presence of + custom fields, because they may or may not exist. + ''' + tmpl = preprocess_template(self.opt_template.text()) + fa = {} + try: + safe_format(tmpl, fa) + except Exception, err: + error_dialog(self, _('Invalid template'), + '

'+_('The template %s is invalid:')%tmpl + \ + '
'+str(err), show=True) + return False return True -# tmpl = preprocess_template(self.opt_template.text()) -# fa = {} -# for x in FORMAT_ARG_DESCS.keys(): -# fa[x]='random long string' -# try: -# tmpl.format(**fa) -# except Exception, err: -# error_dialog(self, _('Invalid template'), -# '

'+_('The template %s is invalid:')%tmpl + \ -# '
'+str(err), show=True) -# return False -# return True def set_value(self, val): self.opt_template.set_value(val) diff --git a/src/calibre/gui2/preferences/sending.ui b/src/calibre/gui2/preferences/sending.ui index b9d1d1e1d2..75b1899a3a 100644 --- a/src/calibre/gui2/preferences/sending.ui +++ b/src/calibre/gui2/preferences/sending.ui @@ -103,7 +103,7 @@ - + From 788128627459035cf0e87fc6b0baa4da708cef3d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 18 Sep 2010 11:08:33 +0100 Subject: [PATCH 041/235] 1) add the composite field custom datatype 2) clean up content server code so it uses the new formatting facilities --- src/calibre/devices/usbms/books.py | 7 ++- src/calibre/ebooks/metadata/book/__init__.py | 7 ++- src/calibre/ebooks/metadata/book/base.py | 35 +++++++++--- src/calibre/gui2/library/models.py | 33 ++++++++++-- src/calibre/gui2/preferences/columns.py | 3 +- .../gui2/preferences/create_custom_column.py | 30 ++++++++--- .../gui2/preferences/create_custom_column.ui | 53 ++++++++++++++++++- src/calibre/library/custom_columns.py | 6 +-- src/calibre/library/database2.py | 1 + src/calibre/library/field_metadata.py | 2 +- src/calibre/library/server/mobile.py | 36 +++++-------- src/calibre/library/server/opds.py | 24 ++++----- src/calibre/library/server/xml.py | 40 ++++++-------- 13 files changed, 181 insertions(+), 96 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index eab625f7be..13fcb90b49 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -137,7 +137,6 @@ class CollectionsBookList(BookList): # For existing books, modify the collections only if the user # specified 'on_connect' attrs = collection_attributes - meta_vals = book.get_all_non_none_attributes() for attr in attrs: attr = attr.strip() ign, val, orig_val, fm = book.format_field_extended(attr) @@ -166,7 +165,7 @@ class CollectionsBookList(BookList): continue if attr == 'series' or \ ('series' in collection_attributes and - meta_vals.get('series', None) == category): + book.get('series', None) == category): is_series = True cat_name = self.compute_category_name(attr, category, fm) if cat_name not in collections: @@ -177,10 +176,10 @@ class CollectionsBookList(BookList): collections_lpaths[cat_name].add(lpath) if is_series: collections[cat_name].append( - (book, meta_vals.get(attr+'_index', sys.maxint))) + (book, book.get(attr+'_index', sys.maxint))) else: collections[cat_name].append( - (book, meta_vals.get('title_sort', 'zzzz'))) + (book, book.get('title_sort', 'zzzz'))) # Sort collections result = {} for category, books in collections.items(): diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index e087f8072d..e6dff9110b 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -81,9 +81,8 @@ DEVICE_METADATA_FIELDS = frozenset([ CALIBRE_METADATA_FIELDS = frozenset([ 'application_id', # An application id, currently set to the db_id. - # the calibre primary key of the item. 'db_id', # the calibre primary key of the item. - # TODO: NEWMETA: May want to remove once Sony's no longer use it + 'formats', # list of formats (extensions) for this book ] ) @@ -124,5 +123,5 @@ SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( PUBLICATION_METADATA_FIELDS).union( CALIBRE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS) - \ - frozenset(['device_collections']) - # device_collections is rebuilt when needed + frozenset(['device_collections', 'formats']) + # these are rebuilt when needed diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index b252f518da..31485dfe1b 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -5,8 +5,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import copy -import traceback +import copy, re, string, traceback from calibre import prints from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS @@ -33,6 +32,23 @@ NULL_VALUES = { field_metadata = FieldMetadata() +class SafeFormat(string.Formatter): + ''' + Provides a format function that substitutes '' for any missing value + ''' + def get_value(self, key, args, mi): + ign, v = mi.format_field(key, series_with_index=False) + if v is None: + return '' + return v + +composite_formatter = SafeFormat() +compress_spaces = re.compile(r'\s+') + +def format_composite(x, mi): + ans = composite_formatter.vformat(x, [], mi).strip() + return compress_spaces.sub(' ', ans) + class Metadata(object): ''' @@ -343,18 +359,19 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) - def format_field(self, key): - name, val, ign, ign = self.format_field_extended(key) + def format_field(self, key, series_with_index=True): + name, val, ign, ign = self.format_field_extended(key, series_with_index) return (name, val) - def format_field_extended(self, key): + def format_field_extended(self, key, series_with_index=True): from calibre.ebooks.metadata import authors_to_string ''' returns the tuple (field_name, formatted_value) ''' if key in self.user_metadata_keys: res = self.get(key, None) - if res is None or res == '': + cmeta = self.get_user_metadata(key, make_copy=False) + if cmeta['datatype'] != 'composite' and (res is None or res == ''): return (None, None, None, None) orig_res = res cmeta = self.get_user_metadata(key, make_copy=False) @@ -362,13 +379,15 @@ class Metadata(object): datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: res = u', '.join(res) - elif datatype == 'series': + elif datatype == 'series' and series_with_index: res = res + \ ' [%s]'%self.format_series_index(val=self.get_extra(key)) elif datatype == 'datetime': res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') + elif datatype == 'composite': + res = format_composite(cmeta['display']['composite_template'], self) return (name, res, orig_res, cmeta) if key in field_metadata and field_metadata[key]['kind'] == 'field': @@ -383,7 +402,7 @@ class Metadata(object): res = authors_to_string(res) elif datatype == 'text' and fmeta['is_multiple']: res = u', '.join(res) - elif datatype == 'series': + elif datatype == 'series' and series_with_index: res = res + ' [%s]'%self.format_series_index() elif datatype == 'datetime': res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index e9e688c93b..7839b89d7e 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -86,6 +86,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.last_search = '' # The last search performed on this model self.column_map = [] self.headers = {} + self.metadata_cache = {} self.alignment_map = {} self.buffer_size = buffer self.cover_cache = None @@ -114,6 +115,16 @@ class BooksModel(QAbstractTableModel): # {{{ def clear_caches(self): if self.cover_cache: self.cover_cache.clear_cache() + self.metadata_cache = {} + + def get_cached_metadata(self, idx): + if idx not in self.metadata_cache: + self.metadata_cache[idx] = self.db.get_metadata(idx) + return self.metadata_cache[idx] + + def remove_cached_metadata(self, idx): + if idx in self.metadata_cache: + del self.metadata_cache[idx] def read_config(self): self.use_roman_numbers = config['use_roman_numerals_for_series_number'] @@ -146,6 +157,7 @@ class BooksModel(QAbstractTableModel): # {{{ elif col in self.custom_columns: self.headers[col] = self.custom_columns[col]['name'] + self.metadata_cache = {} self.build_data_convertors() self.reset() self.database_changed.emit(db) @@ -159,11 +171,13 @@ class BooksModel(QAbstractTableModel): # {{{ db.add_listener(refresh_cover) def refresh_ids(self, ids, current_row=-1): + self.metadata_cache = {} rows = self.db.refresh_ids(ids) if rows: self.refresh_rows(rows, current_row=current_row) def refresh_rows(self, rows, current_row=-1): + self.metadata_cache = {} for row in rows: if row == current_row: self.new_bookdisplay_data.emit( @@ -193,6 +207,7 @@ class BooksModel(QAbstractTableModel): # {{{ return ret def count_changed(self, *args): + self.metadata_cache = {} self.count_changed_signal.emit(self.db.count()) def row_indices(self, index): @@ -262,6 +277,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.sorting_done.emit(self.db.index) def refresh(self, reset=True): + self.metadata_cache = {} self.db.refresh(field=None) self.resort(reset=reset) @@ -318,7 +334,7 @@ class BooksModel(QAbstractTableModel): # {{{ data[_('Series')] = \ _('Book %s of %s.')%\ (sidx, prepare_string_for_xml(series)) - mi = self.db.get_metadata(idx) + mi = self.get_cached_metadata(idx) for key in mi.user_metadata_keys: name, val = mi.format_field(key) if val is not None: @@ -327,6 +343,7 @@ class BooksModel(QAbstractTableModel): # {{{ def set_cache(self, idx): l, r = 0, self.count()-1 + self.remove_cached_metadata(idx) if self.cover_cache is not None: l = max(l, idx-self.buffer_size) r = min(r, idx+self.buffer_size) @@ -586,6 +603,10 @@ class BooksModel(QAbstractTableModel): # {{{ def number_type(r, idx=-1): return QVariant(self.db.data[r][idx]) + def composite_type(r, key=None): + mi = self.get_cached_metadata(r) + return QVariant(mi.format_field(key)[1]) + self.dc = { 'title' : functools.partial(text_type, idx=self.db.field_metadata['title']['rec_index'], mult=False), @@ -620,7 +641,8 @@ class BooksModel(QAbstractTableModel): # {{{ idx = self.custom_columns[col]['rec_index'] datatype = self.custom_columns[col]['datatype'] if datatype in ('text', 'comments'): - self.dc[col] = functools.partial(text_type, idx=idx, mult=self.custom_columns[col]['is_multiple']) + self.dc[col] = functools.partial(text_type, idx=idx, + mult=self.custom_columns[col]['is_multiple']) elif datatype in ('int', 'float'): self.dc[col] = functools.partial(number_type, idx=idx) elif datatype == 'datetime': @@ -628,13 +650,15 @@ class BooksModel(QAbstractTableModel): # {{{ elif datatype == 'bool': self.dc[col] = functools.partial(bool_type, idx=idx) self.dc_decorator[col] = functools.partial( - bool_type_decorator, idx=idx, - bool_cols_are_tristate=tweaks['bool_custom_columns_are_tristate'] == 'yes') + bool_type_decorator, idx=idx, + bool_cols_are_tristate=tweaks['bool_custom_columns_are_tristate'] == 'yes') elif datatype == 'rating': self.dc[col] = functools.partial(rating_type, idx=idx) elif datatype == 'series': self.dc[col] = functools.partial(series_type, idx=idx, siix=self.db.field_metadata.cc_series_index_column_for(col)) + elif datatype == 'composite': + self.dc[col] = functools.partial(composite_type, key=col) else: print 'What type is this?', col, datatype # build a index column to data converter map, to remove the string lookup in the data loop @@ -729,6 +753,7 @@ class BooksModel(QAbstractTableModel): # {{{ if role == Qt.EditRole: row, col = index.row(), index.column() column = self.column_map[col] + self.remove_cached_metadata(row) if self.is_custom_column(column): if not self.set_custom_column_data(row, column, value): return False diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py index c1b9230f42..761a9880b1 100644 --- a/src/calibre/gui2/preferences/columns.py +++ b/src/calibre/gui2/preferences/columns.py @@ -155,7 +155,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): name=self.custcols[c]['name'], datatype=self.custcols[c]['datatype'], is_multiple=self.custcols[c]['is_multiple'], - display = self.custcols[c]['display']) + display = self.custcols[c]['display'], + editable = self.custcols[c]['editable']) must_restart = True elif '*deleteme' in self.custcols[c]: db.delete_custom_column(label=self.custcols[c]['label']) diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index e8ab8707e2..4b21301ccd 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -38,6 +38,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): 'is_multiple':False}, 8:{'datatype':'bool', 'text':_('Yes/No'), 'is_multiple':False}, + 8:{'datatype':'composite', + 'text':_('Field built from other fields'), 'is_multiple':False}, } def __init__(self, parent, editing, standard_colheads, standard_colnames): @@ -86,6 +88,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): if ct == 'datetime': if c['display'].get('date_format', None): self.date_format_box.setText(c['display'].get('date_format', '')) + elif ct == 'composite': + self.composite_box.setText(c['display'].get('composite_template', '')) self.datatype_changed() self.exec_() @@ -94,9 +98,10 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): col_type = self.column_types[self.column_type_box.currentIndex()]['datatype'] except: col_type = None - df_visible = col_type == 'datetime' for x in ('box', 'default_label', 'label'): - getattr(self, 'date_format_'+x).setVisible(df_visible) + getattr(self, 'date_format_'+x).setVisible(col_type == 'datetime') + for x in ('box', 'default_label', 'label'): + getattr(self, 'composite_'+x).setVisible(col_type == 'composite') def accept(self): @@ -122,6 +127,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): bad_col = True if bad_col: return self.simple_error('', _('The lookup name %s is already used')%col) + bad_head = False for t in self.parent.custcols: if self.parent.custcols[t]['name'] == col_heading: @@ -133,12 +139,20 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): if bad_head: return self.simple_error('', _('The heading %s is already used')%col_heading) - date_format = {} + display_dict = {} if col_type == 'datetime': if self.date_format_box.text(): - date_format = {'date_format':unicode(self.date_format_box.text())} + display_dict = {'date_format':unicode(self.date_format_box.text())} else: - date_format = {'date_format': None} + display_dict = {'date_format': None} + + if col_type == 'composite': + if not self.composite_box.text(): + return self.simple_error('', _('You must enter a template for composite fields')%col_heading) + display_dict = {'composite_template':unicode(self.composite_box.text())} + is_editable = False + else: + is_editable = True db = self.parent.gui.library_view.model().db key = db.field_metadata.custom_field_prefix+col @@ -148,8 +162,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): 'label':col, 'name':col_heading, 'datatype':col_type, - 'editable':True, - 'display':date_format, + 'editable':is_editable, + 'display':display_dict, 'normalized':None, 'colnum':None, 'is_multiple':is_multiple, @@ -164,7 +178,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): item.setText(col_heading) self.parent.custcols[self.orig_column_name]['label'] = col self.parent.custcols[self.orig_column_name]['name'] = col_heading - self.parent.custcols[self.orig_column_name]['display'].update(date_format) + self.parent.custcols[self.orig_column_name]['display'].update(display_dict) self.parent.custcols[self.orig_column_name]['*edited'] = True self.parent.custcols[self.orig_column_name]['*must_restart'] = True QDialog.accept(self) diff --git a/src/calibre/gui2/preferences/create_custom_column.ui b/src/calibre/gui2/preferences/create_custom_column.ui index 5cb9494845..640becca8c 100644 --- a/src/calibre/gui2/preferences/create_custom_column.ui +++ b/src/calibre/gui2/preferences/create_custom_column.ui @@ -147,9 +147,59 @@ + + + + + + + 0 + 0 + + + + <p>Field template. Uses the same syntax as save templates. + + + + + + + Similar to save templates. For example, {title} {isbn} + + + Default: (nothing) + + + + + + + + + &Template + + + composite_box + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - + Qt::Horizontal @@ -184,6 +234,7 @@ column_heading_box column_type_box date_format_box + composite_box button_box diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index 4ba664dadc..d74024280e 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -18,7 +18,7 @@ from calibre.utils.date import parse_date class CustomColumns(object): CUSTOM_DATA_TYPES = frozenset(['rating', 'text', 'comments', 'datetime', - 'int', 'float', 'bool', 'series']) + 'int', 'float', 'bool', 'series', 'composite']) def custom_table_names(self, num): return 'custom_column_%d'%num, 'books_custom_column_%d_link'%num @@ -540,7 +540,7 @@ class CustomColumns(object): if datatype not in self.CUSTOM_DATA_TYPES: raise ValueError('%r is not a supported data type'%datatype) normalized = datatype not in ('datetime', 'comments', 'int', 'bool', - 'float') + 'float', 'composite') is_multiple = is_multiple and datatype in ('text',) num = self.conn.execute( ('INSERT INTO ' @@ -551,7 +551,7 @@ class CustomColumns(object): if datatype in ('rating', 'int'): dt = 'INT' - elif datatype in ('text', 'comments', 'series'): + elif datatype in ('text', 'comments', 'series', 'composite'): dt = 'TEXT' elif datatype in ('float',): dt = 'REAL' diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 9e9e75a26e..d06d217b76 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -538,6 +538,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.pubdate = self.pubdate(idx, index_is_id=index_is_id) mi.uuid = self.uuid(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) + mi.formats = self.formats(idx, index_is_id=index_is_id).split(',') tags = self.tags(idx, index_is_id=index_is_id) if tags: mi.tags = [i.strip() for i in tags.split(',')] diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index 2773f573b2..dcdfcfd9d6 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -68,7 +68,7 @@ class FieldMetadata(dict): ''' VALID_DATA_TYPES = frozenset([None, 'rating', 'text', 'comments', 'datetime', - 'int', 'float', 'bool', 'series']) + 'int', 'float', 'bool', 'series', 'composite']) # Builtin metadata {{{ diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index ab5b39eed8..8e7c75b0ac 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -228,29 +228,19 @@ class MobileServer(object): for key in CKEYS: def concat(name, val): return '%s:#:%s'%(name, unicode(val)) - val = record[CFM[key]['rec_index']] - if val: - datatype = CFM[key]['datatype'] - if datatype in ['comments']: - continue - name = CFM[key]['name'] - if datatype == 'text' and CFM[key]['is_multiple']: - book[key] = concat(name, - format_tag_string(val, '|', - no_tag_count=True)) - elif datatype == 'series': - book[key] = concat(name, '%s [%s]'%(val, - fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - book[key] = concat(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy'))) - elif datatype == 'bool': - if val: - book[key] = concat(name, __builtin__._('Yes')) - else: - book[key] = concat(name, __builtin__._('No')) - else: - book[key] = concat(name, val) + mi = self.db.get_metadata(record[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) + if val is None: + continue + datatype = CFM[key]['datatype'] + if datatype in ['comments']: + continue + if datatype == 'text' and CFM[key]['is_multiple']: + book[key] = concat(name, + format_tag_string(val, ',', + no_tag_count=True)) + else: + book[key] = concat(name, val) updated = self.db.last_modified() diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index e495598a2f..0eb7379ac5 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -132,7 +132,8 @@ def CATALOG_GROUP_ENTRY(item, category, base_href, version, updated): link ) -def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): +def ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS): + FM = db.FIELD_MAP title = item[FM['title']] if not title: title = _('Unknown') @@ -157,22 +158,16 @@ def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): (series, fmt_sidx(float(item[FM['series_index']])))) for key in CKEYS: - val = item[CFM[key]['rec_index']] + mi = db.get_metadata(item[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) if val is not None: - name = CFM[key]['name'] datatype = CFM[key]['datatype'] if datatype == 'text' and CFM[key]['is_multiple']: - extra.append('%s: %s
'%(name, format_tag_string(val, '|', + extra.append('%s: %s
'%(name, format_tag_string(val, ',', ignore_max=True, no_tag_count=True))) - elif datatype == 'series': - extra.append('%s: %s [%s]
'%(name, val, - fmt_sidx(item[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - extra.append('%s: %s
'%(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy')))) else: - extra.append('%s: %s
' % (CFM[key]['name'], val)) + extra.append('%s: %s
'%(name, val)) comments = item[FM['comments']] if comments: comments = comments_to_html(comments) @@ -280,13 +275,14 @@ class NavFeed(Feed): class AcquisitionFeed(NavFeed): def __init__(self, updated, id_, items, offsets, page_url, up_url, version, - FM, CFM): + db): NavFeed.__init__(self, id_, updated, version, offsets, page_url, up_url) + CFM = db.field_metadata CKEYS = [key for key in sorted(CFM.get_custom_fields(), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] for item in items: - self.root.append(ACQUISITION_ENTRY(item, version, FM, updated, + self.root.append(ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS)) class CategoryFeed(NavFeed): @@ -384,7 +380,7 @@ class OPDSServer(object): cherrypy.response.headers['Last-Modified'] = self.last_modified(updated) cherrypy.response.headers['Content-Type'] = 'application/atom+xml;profile=opds-catalog' return str(AcquisitionFeed(updated, id_, items, offsets, - page_url, up_url, version, self.db.FIELD_MAP, self.db.field_metadata)) + page_url, up_url, version, self.db)) def opds_search(self, query=None, version=0, offset=0): try: diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py index 8715dda7d0..7f5bc31e70 100644 --- a/src/calibre/library/server/xml.py +++ b/src/calibre/library/server/xml.py @@ -102,31 +102,21 @@ class XMLServer(object): for key in CKEYS: def concat(name, val): return '%s:#:%s'%(name, unicode(val)) - val = record[CFM[key]['rec_index']] - if val: - datatype = CFM[key]['datatype'] - if datatype in ['comments']: - continue - k = str('CF_'+key[1:]) - name = CFM[key]['name'] - custcols.append(k) - if datatype == 'text' and CFM[key]['is_multiple']: - kwargs[k] = concat('#T#'+name, - format_tag_string(val,'|', - ignore_max=True)) - elif datatype == 'series': - kwargs[k] = concat(name, '%s [%s]'%(val, - fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - kwargs[k] = concat(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy'))) - elif datatype == 'bool': - if val: - kwargs[k] = concat(name, __builtin__._('Yes')) - else: - kwargs[k] = concat(name, __builtin__._('No')) - else: - kwargs[k] = concat(name, val) + mi = self.db.get_metadata(record[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) + if not val: + continue + datatype = CFM[key]['datatype'] + if datatype in ['comments']: + continue + k = str('CF_'+key[1:]) + name = CFM[key]['name'] + custcols.append(k) + if datatype == 'text' and CFM[key]['is_multiple']: + kwargs[k] = concat('#T#'+name, format_tag_string(val,',', + ignore_max=True)) + else: + kwargs[k] = concat(name, val) kwargs['custcols'] = ','.join(custcols) books.append(E.book(c, **kwargs)) From 83fc5b2cc0452533cdcdc342d8ce21e3ab5501a4 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 18 Sep 2010 11:38:51 +0100 Subject: [PATCH 042/235] Small cleanup of composite field code. --- src/calibre/ebooks/metadata/book/base.py | 12 ++++++++---- src/calibre/gui2/library/models.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 31485dfe1b..ce6e2ee78d 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -46,7 +46,10 @@ composite_formatter = SafeFormat() compress_spaces = re.compile(r'\s+') def format_composite(x, mi): - ans = composite_formatter.vformat(x, [], mi).strip() + try: + ans = composite_formatter.vformat(x, [], mi).strip() + except: + ans = x return compress_spaces.sub(' ', ans) class Metadata(object): @@ -86,7 +89,10 @@ class Metadata(object): except AttributeError: pass if field in _data['user_metadata'].iterkeys(): - return _data['user_metadata'][field]['#value#'] + d = _data['user_metadata'][field] + if d['datatype'] != 'composite': + return d['#value#'] + return format_composite(d['display']['composite_template'], self) raise AttributeError( 'Metadata object has no attribute named: '+ repr(field)) @@ -386,8 +392,6 @@ class Metadata(object): res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') - elif datatype == 'composite': - res = format_composite(cmeta['display']['composite_template'], self) return (name, res, orig_res, cmeta) if key in field_metadata and field_metadata[key]['kind'] == 'field': diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 7839b89d7e..2a116f6f3d 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -605,7 +605,7 @@ class BooksModel(QAbstractTableModel): # {{{ def composite_type(r, key=None): mi = self.get_cached_metadata(r) - return QVariant(mi.format_field(key)[1]) + return QVariant(mi.get(key, '')) self.dc = { 'title' : functools.partial(text_type, From c59545a96a968488221f494fcee0baccab642a63 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 18 Sep 2010 13:45:01 +0100 Subject: [PATCH 043/235] Change composites to use the cache correctly, so that searches & sorts used. In the process, remove the metadata cache from models.py. Fix some bugs introduced by composite columns: 1) no edit widget in bulk_metadata edit 2) explicitly do not make a delegate in views.py --- src/calibre/gui2/custom_column_widgets.py | 2 ++ src/calibre/gui2/library/models.py | 28 ++--------------------- src/calibre/gui2/library/views.py | 3 +++ src/calibre/library/caches.py | 20 +++++++++++++++- src/calibre/library/database2.py | 11 ++++----- 5 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index 67ab94d29a..d16233be1a 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -348,6 +348,8 @@ def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, pa ans = [] column = row = comments_row = 0 for col in cols: + if not x[col]['editable']: + continue dt = x[col]['datatype'] if dt == 'comments': continue diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 2a116f6f3d..be1bf9bc2d 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -86,7 +86,6 @@ class BooksModel(QAbstractTableModel): # {{{ self.last_search = '' # The last search performed on this model self.column_map = [] self.headers = {} - self.metadata_cache = {} self.alignment_map = {} self.buffer_size = buffer self.cover_cache = None @@ -115,16 +114,6 @@ class BooksModel(QAbstractTableModel): # {{{ def clear_caches(self): if self.cover_cache: self.cover_cache.clear_cache() - self.metadata_cache = {} - - def get_cached_metadata(self, idx): - if idx not in self.metadata_cache: - self.metadata_cache[idx] = self.db.get_metadata(idx) - return self.metadata_cache[idx] - - def remove_cached_metadata(self, idx): - if idx in self.metadata_cache: - del self.metadata_cache[idx] def read_config(self): self.use_roman_numbers = config['use_roman_numerals_for_series_number'] @@ -157,7 +146,6 @@ class BooksModel(QAbstractTableModel): # {{{ elif col in self.custom_columns: self.headers[col] = self.custom_columns[col]['name'] - self.metadata_cache = {} self.build_data_convertors() self.reset() self.database_changed.emit(db) @@ -171,13 +159,11 @@ class BooksModel(QAbstractTableModel): # {{{ db.add_listener(refresh_cover) def refresh_ids(self, ids, current_row=-1): - self.metadata_cache = {} rows = self.db.refresh_ids(ids) if rows: self.refresh_rows(rows, current_row=current_row) def refresh_rows(self, rows, current_row=-1): - self.metadata_cache = {} for row in rows: if row == current_row: self.new_bookdisplay_data.emit( @@ -207,7 +193,6 @@ class BooksModel(QAbstractTableModel): # {{{ return ret def count_changed(self, *args): - self.metadata_cache = {} self.count_changed_signal.emit(self.db.count()) def row_indices(self, index): @@ -277,7 +262,6 @@ class BooksModel(QAbstractTableModel): # {{{ self.sorting_done.emit(self.db.index) def refresh(self, reset=True): - self.metadata_cache = {} self.db.refresh(field=None) self.resort(reset=reset) @@ -334,7 +318,7 @@ class BooksModel(QAbstractTableModel): # {{{ data[_('Series')] = \ _('Book %s of %s.')%\ (sidx, prepare_string_for_xml(series)) - mi = self.get_cached_metadata(idx) + mi = self.db.get_metadata(idx) for key in mi.user_metadata_keys: name, val = mi.format_field(key) if val is not None: @@ -343,7 +327,6 @@ class BooksModel(QAbstractTableModel): # {{{ def set_cache(self, idx): l, r = 0, self.count()-1 - self.remove_cached_metadata(idx) if self.cover_cache is not None: l = max(l, idx-self.buffer_size) r = min(r, idx+self.buffer_size) @@ -603,10 +586,6 @@ class BooksModel(QAbstractTableModel): # {{{ def number_type(r, idx=-1): return QVariant(self.db.data[r][idx]) - def composite_type(r, key=None): - mi = self.get_cached_metadata(r) - return QVariant(mi.get(key, '')) - self.dc = { 'title' : functools.partial(text_type, idx=self.db.field_metadata['title']['rec_index'], mult=False), @@ -640,7 +619,7 @@ class BooksModel(QAbstractTableModel): # {{{ for col in self.custom_columns: idx = self.custom_columns[col]['rec_index'] datatype = self.custom_columns[col]['datatype'] - if datatype in ('text', 'comments'): + if datatype in ('text', 'comments', 'composite'): self.dc[col] = functools.partial(text_type, idx=idx, mult=self.custom_columns[col]['is_multiple']) elif datatype in ('int', 'float'): @@ -657,8 +636,6 @@ class BooksModel(QAbstractTableModel): # {{{ elif datatype == 'series': self.dc[col] = functools.partial(series_type, idx=idx, siix=self.db.field_metadata.cc_series_index_column_for(col)) - elif datatype == 'composite': - self.dc[col] = functools.partial(composite_type, key=col) else: print 'What type is this?', col, datatype # build a index column to data converter map, to remove the string lookup in the data loop @@ -753,7 +730,6 @@ class BooksModel(QAbstractTableModel): # {{{ if role == Qt.EditRole: row, col = index.row(), index.column() column = self.column_map[col] - self.remove_cached_metadata(row) if self.is_custom_column(column): if not self.set_custom_column_data(row, column, value): return False diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index d67d286aeb..9951edf21b 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -391,6 +391,9 @@ class BooksView(QTableView): # {{{ self.setItemDelegateForColumn(cm.index(colhead), self.cc_bool_delegate) elif cc['datatype'] == 'rating': self.setItemDelegateForColumn(cm.index(colhead), self.rating_delegate) + elif cc['datatype'] == 'composite': + pass + # no delegate for composite columns, as they are not editable else: dattr = colhead+'_delegate' delegate = colhead if hasattr(self, dattr) else 'text' diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 4f795ab733..a013d23cb9 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -121,6 +121,11 @@ class ResultCache(SearchQueryParser): self.build_date_relop_dict() self.build_numeric_relop_dict() + self.composites = [] + for key in field_metadata: + if field_metadata[key]['datatype'] == 'composite': + self.composites.append((key, field_metadata[key]['rec_index'])) + def __getitem__(self, row): return self._data[self._map_filtered[row]] @@ -372,7 +377,7 @@ class ResultCache(SearchQueryParser): if len(self.field_metadata[x]['search_terms']): db_col[x] = self.field_metadata[x]['rec_index'] if self.field_metadata[x]['datatype'] not in \ - ['text', 'comments', 'series']: + ['composite', 'text', 'comments', 'series']: exclude_fields.append(db_col[x]) col_datatype[db_col[x]] = self.field_metadata[x]['datatype'] is_multiple_cols[db_col[x]] = self.field_metadata[x]['is_multiple'] @@ -534,6 +539,10 @@ class ResultCache(SearchQueryParser): self._data[id] = db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0] self._data[id].append(db.has_cover(id, index_is_id=True)) self._data[id].append(db.book_on_device_string(id)) + if len(self.composites) > 0: + mi = db.get_metadata(id, index_is_id=True) + for k,c in self.composites: + self._data[id][c] = mi.format_field(k)[1] except IndexError: return None try: @@ -550,6 +559,10 @@ class ResultCache(SearchQueryParser): self._data[id] = db.conn.get('SELECT * from meta2 WHERE id=?', (id,))[0] self._data[id].append(db.has_cover(id, index_is_id=True)) self._data[id].append(db.book_on_device_string(id)) + if len(self.composites) > 0: + mi = db.get_metadata(id, index_is_id=True) + for k,c in self.composites: + self._data[id][c] = mi.format_field(k)[1] self._map[0:0] = ids self._map_filtered[0:0] = ids @@ -575,6 +588,11 @@ class ResultCache(SearchQueryParser): if item is not None: item.append(db.has_cover(item[0], index_is_id=True)) item.append(db.book_on_device_string(item[0])) + if len(self.composites) > 0: + mi = db.get_metadata(item[0], index_is_id=True) + for k,c in self.composites: + item[c] = mi.format_field(k)[1] + self._map = [i[0] for i in self._data if i is not None] if field is not None: self.sort(field, ascending) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index d06d217b76..d51a8a62c0 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -323,12 +323,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.has_id = self.data.has_id self.count = self.data.count - self.refresh_ondevice = functools.partial(self.data.refresh_ondevice, self) - - self.refresh() - self.last_update_check = self.last_modified() - - for prop in ('author_sort', 'authors', 'comment', 'comments', 'isbn', 'publisher', 'rating', 'series', 'series_index', 'tags', 'title', 'timestamp', 'uuid', 'pubdate', 'ondevice'): @@ -337,6 +331,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): setattr(self, 'title_sort', functools.partial(self.get_property, loc=self.FIELD_MAP['sort'])) + self.refresh_ondevice = functools.partial(self.data.refresh_ondevice, self) + self.refresh() + self.last_update_check = self.last_modified() + + def initialize_database(self): metadata_sqlite = open(P('metadata_sqlite.sql'), 'rb').read() self.conn.executescript(metadata_sqlite) From ed7597ae5f142998c3444f1ad941725fa4d21b0d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sat, 18 Sep 2010 19:40:44 +0100 Subject: [PATCH 044/235] Playing with search & replace. Added 'global' template values to the replace expression. Also fixed some problems with exceptions, and problems with case-insensitive matching in the history boxes. --- src/calibre/ebooks/metadata/book/base.py | 9 +++ src/calibre/gui2/dialogs/metadata_bulk.py | 68 +++++++++++++++++++---- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index ce6e2ee78d..1eae2e5326 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -12,6 +12,7 @@ from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS +from calibre.ebooks.metadata.book import ALL_METADATA_FIELDS from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import isoformat, format_date @@ -131,6 +132,14 @@ class Metadata(object): def set(self, field, val, extra=None): self.__setattr__(field, val, extra) + @property + def all_keys(self): + ''' + All attribute keys known by this instance, even if their value is None + ''' + _data = object.__getattribute__(self, '_data') + return frozenset(ALL_METADATA_FIELDS.union(_data['user_metadata'].iterkeys())) + @property def user_metadata_keys(self): 'The set of user metadata names this object knows about' diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index b7d1d0c54b..1fb889757f 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -4,15 +4,15 @@ __copyright__ = '2008, Kovid Goyal ' '''Dialog to edit metadata in bulk''' from threading import Thread -import re +import re, string -from PyQt4.Qt import QDialog, QGridLayout +from PyQt4.Qt import Qt, QDialog, QGridLayout from PyQt4 import QtGui from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog from calibre.gui2.dialogs.tag_editor import TagEditor from calibre.ebooks.metadata import string_to_authors, \ - authors_to_string + authors_to_string, MetaInformation from calibre.gui2.custom_column_widgets import populate_metadata_page from calibre.gui2.dialogs.progress import BlockingBusy from calibre.gui2 import error_dialog, Dispatcher @@ -99,6 +99,26 @@ class Worker(Thread): self.callback() +class SafeFormat(string.Formatter): + ''' + Provides a format function that substitutes '' for any missing value + ''' + def get_value(self, key, args, vals): + v = vals.get(key, None) + if v is None: + return '' + if isinstance(v, (tuple, list)): + v = ','.join(v) + return v + +composite_formatter = SafeFormat() + +def format_composite(x, mi): + try: + ans = composite_formatter.vformat(x, [], mi).strip() + except: + ans = x + return ans class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): @@ -163,7 +183,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.s_r_number_of_books = min(7, len(self.ids)) for i in range(1,self.s_r_number_of_books+1): w = QtGui.QLabel(self.tabWidgetPage3) - w.setText(_('Book %d:'%i)) + w.setText(_('Book %d:')%i) self.gridLayout1.addWidget(w, i+offset, 0, 1, 1) w = QtGui.QLineEdit(self.tabWidgetPage3) w.setReadOnly(True) @@ -205,6 +225,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.test_text.editTextChanged[str].connect(self.s_r_paint_results) self.central_widget.setCurrentIndex(0) + self.search_for.completer().setCaseSensitivity(Qt.CaseSensitive) + self.replace_with.completer().setCaseSensitivity(Qt.CaseSensitive) + + def s_r_field_changed(self, txt): txt = unicode(txt) for i in range(0, self.s_r_number_of_books): @@ -220,6 +244,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): if val: val.sort(cmp=lambda x,y: cmp(x.lower(), y.lower())) val = val[0] + if txt == 'authors': + val = val.replace('|', ',') else: val = '' else: @@ -239,37 +265,55 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): for i in range(0,self.s_r_number_of_books): getattr(self, 'book_%d_result'%(i+1)).setText('') + field_match_re = re.compile(r'(^|[^\\])(\\g<)([^>]+)(>)') + def s_r_func(self, match): - rf = self.s_r_functions[unicode(self.replace_func.currentText())] - rv = unicode(self.replace_with.text()) - val = match.expand(rv) - return rf(val) + rfunc = self.s_r_functions[unicode(self.replace_func.currentText())] + rtext = unicode(self.replace_with.text()) + mi_data = self.mi.get_all_non_none_attributes() + + def fm_func(m): + try: + if m.group(3) not in self.mi.all_keys: return m.group(0) + else: return '%s{%s}'%(m.group(1), m.group(3)) + except: + import traceback + traceback.print_exc() + return m.group(0) + + rtext = re.sub(self.field_match_re, fm_func, rtext) + rtext = match.expand(rtext) + rtext = format_composite(rtext, mi_data) + return rfunc(rtext) def s_r_paint_results(self, txt): self.s_r_error = None self.s_r_set_colors() try: self.s_r_obj = re.compile(unicode(self.search_for.text())) - except re.error as e: + except Exception as e: self.s_r_obj = None self.s_r_error = e self.s_r_set_colors() return try: + self.mi = MetaInformation(None, None) self.test_result.setText(self.s_r_obj.sub(self.s_r_func, unicode(self.test_text.text()))) - except re.error as e: + except Exception as e: self.s_r_error = e self.s_r_set_colors() return for i in range(0,self.s_r_number_of_books): + id = self.ids[i] + self.mi = self.db.get_metadata(id, index_is_id=True) wt = getattr(self, 'book_%d_text'%(i+1)) wr = getattr(self, 'book_%d_result'%(i+1)) try: wr.setText(self.s_r_obj.sub(self.s_r_func, unicode(wt.text()))) - except re.error as e: + except Exception as e: self.s_r_error = e self.s_r_set_colors() break @@ -303,6 +347,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): # The standard tags and authors values want to be lists. # All custom columns are to be strings val = fm['is_multiple'].join(val) + elif field == 'authors': + val = [v.replace('|', ',') for v in val] else: val = apply_pattern(val) From 3f763407a02f5c00599bdbe43f053a821fb0a3e3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 18 Sep 2010 20:37:59 -0600 Subject: [PATCH 045/235] Refactor to use new field formatting infrastructure of Metadata class --- src/calibre/devices/usbms/books.py | 7 ++-- src/calibre/ebooks/metadata/book/__init__.py | 7 ++-- src/calibre/ebooks/metadata/book/base.py | 12 +++--- src/calibre/library/database2.py | 1 + src/calibre/library/server/mobile.py | 36 +++++++----------- src/calibre/library/server/opds.py | 25 +++++------- src/calibre/library/server/xml.py | 40 ++++++++------------ 7 files changed, 51 insertions(+), 77 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index eab625f7be..13fcb90b49 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -137,7 +137,6 @@ class CollectionsBookList(BookList): # For existing books, modify the collections only if the user # specified 'on_connect' attrs = collection_attributes - meta_vals = book.get_all_non_none_attributes() for attr in attrs: attr = attr.strip() ign, val, orig_val, fm = book.format_field_extended(attr) @@ -166,7 +165,7 @@ class CollectionsBookList(BookList): continue if attr == 'series' or \ ('series' in collection_attributes and - meta_vals.get('series', None) == category): + book.get('series', None) == category): is_series = True cat_name = self.compute_category_name(attr, category, fm) if cat_name not in collections: @@ -177,10 +176,10 @@ class CollectionsBookList(BookList): collections_lpaths[cat_name].add(lpath) if is_series: collections[cat_name].append( - (book, meta_vals.get(attr+'_index', sys.maxint))) + (book, book.get(attr+'_index', sys.maxint))) else: collections[cat_name].append( - (book, meta_vals.get('title_sort', 'zzzz'))) + (book, book.get('title_sort', 'zzzz'))) # Sort collections result = {} for category, books in collections.items(): diff --git a/src/calibre/ebooks/metadata/book/__init__.py b/src/calibre/ebooks/metadata/book/__init__.py index e087f8072d..e6dff9110b 100644 --- a/src/calibre/ebooks/metadata/book/__init__.py +++ b/src/calibre/ebooks/metadata/book/__init__.py @@ -81,9 +81,8 @@ DEVICE_METADATA_FIELDS = frozenset([ CALIBRE_METADATA_FIELDS = frozenset([ 'application_id', # An application id, currently set to the db_id. - # the calibre primary key of the item. 'db_id', # the calibre primary key of the item. - # TODO: NEWMETA: May want to remove once Sony's no longer use it + 'formats', # list of formats (extensions) for this book ] ) @@ -124,5 +123,5 @@ SERIALIZABLE_FIELDS = SOCIAL_METADATA_FIELDS.union( PUBLICATION_METADATA_FIELDS).union( CALIBRE_METADATA_FIELDS).union( DEVICE_METADATA_FIELDS) - \ - frozenset(['device_collections']) - # device_collections is rebuilt when needed + frozenset(['device_collections', 'formats']) + # these are rebuilt when needed diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index b252f518da..8868709db2 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -343,26 +343,26 @@ class Metadata(object): def format_rating(self): return unicode(self.rating) - def format_field(self, key): - name, val, ign, ign = self.format_field_extended(key) + def format_field(self, key, series_with_index=True): + name, val, ign, ign = self.format_field_extended(key, series_with_index) return (name, val) - def format_field_extended(self, key): + def format_field_extended(self, key, series_with_index=True): from calibre.ebooks.metadata import authors_to_string ''' returns the tuple (field_name, formatted_value) ''' if key in self.user_metadata_keys: res = self.get(key, None) + cmeta = self.get_user_metadata(key, make_copy=False) if res is None or res == '': return (None, None, None, None) orig_res = res - cmeta = self.get_user_metadata(key, make_copy=False) name = unicode(cmeta['name']) datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: res = u', '.join(res) - elif datatype == 'series': + elif datatype == 'series' and series_with_index: res = res + \ ' [%s]'%self.format_series_index(val=self.get_extra(key)) elif datatype == 'datetime': @@ -383,7 +383,7 @@ class Metadata(object): res = authors_to_string(res) elif datatype == 'text' and fmeta['is_multiple']: res = u', '.join(res) - elif datatype == 'series': + elif datatype == 'series' and series_with_index: res = res + ' [%s]'%self.format_series_index() elif datatype == 'datetime': res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 9e9e75a26e..d06d217b76 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -538,6 +538,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.pubdate = self.pubdate(idx, index_is_id=index_is_id) mi.uuid = self.uuid(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) + mi.formats = self.formats(idx, index_is_id=index_is_id).split(',') tags = self.tags(idx, index_is_id=index_is_id) if tags: mi.tags = [i.strip() for i in tags.split(',')] diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index ab5b39eed8..8e7c75b0ac 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -228,29 +228,19 @@ class MobileServer(object): for key in CKEYS: def concat(name, val): return '%s:#:%s'%(name, unicode(val)) - val = record[CFM[key]['rec_index']] - if val: - datatype = CFM[key]['datatype'] - if datatype in ['comments']: - continue - name = CFM[key]['name'] - if datatype == 'text' and CFM[key]['is_multiple']: - book[key] = concat(name, - format_tag_string(val, '|', - no_tag_count=True)) - elif datatype == 'series': - book[key] = concat(name, '%s [%s]'%(val, - fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - book[key] = concat(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy'))) - elif datatype == 'bool': - if val: - book[key] = concat(name, __builtin__._('Yes')) - else: - book[key] = concat(name, __builtin__._('No')) - else: - book[key] = concat(name, val) + mi = self.db.get_metadata(record[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) + if val is None: + continue + datatype = CFM[key]['datatype'] + if datatype in ['comments']: + continue + if datatype == 'text' and CFM[key]['is_multiple']: + book[key] = concat(name, + format_tag_string(val, ',', + no_tag_count=True)) + else: + book[key] = concat(name, val) updated = self.db.last_modified() diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index e495598a2f..d495f58fa1 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -20,7 +20,6 @@ from calibre.library.comments import comments_to_html from calibre.library.server.utils import format_tag_string from calibre import guess_type from calibre.utils.ordered_dict import OrderedDict -from calibre.utils.date import format_date BASE_HREFS = { 0 : '/stanza', @@ -132,7 +131,8 @@ def CATALOG_GROUP_ENTRY(item, category, base_href, version, updated): link ) -def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): +def ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS): + FM = db.FIELD_MAP title = item[FM['title']] if not title: title = _('Unknown') @@ -157,22 +157,16 @@ def ACQUISITION_ENTRY(item, version, FM, updated, CFM, CKEYS): (series, fmt_sidx(float(item[FM['series_index']])))) for key in CKEYS: - val = item[CFM[key]['rec_index']] + mi = db.get_metadata(item[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) if val is not None: - name = CFM[key]['name'] datatype = CFM[key]['datatype'] if datatype == 'text' and CFM[key]['is_multiple']: - extra.append('%s: %s
'%(name, format_tag_string(val, '|', + extra.append('%s: %s
'%(name, format_tag_string(val, ',', ignore_max=True, no_tag_count=True))) - elif datatype == 'series': - extra.append('%s: %s [%s]
'%(name, val, - fmt_sidx(item[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - extra.append('%s: %s
'%(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy')))) else: - extra.append('%s: %s
' % (CFM[key]['name'], val)) + extra.append('%s: %s
'%(name, val)) comments = item[FM['comments']] if comments: comments = comments_to_html(comments) @@ -280,13 +274,14 @@ class NavFeed(Feed): class AcquisitionFeed(NavFeed): def __init__(self, updated, id_, items, offsets, page_url, up_url, version, - FM, CFM): + db): NavFeed.__init__(self, id_, updated, version, offsets, page_url, up_url) + CFM = db.field_metadata CKEYS = [key for key in sorted(CFM.get_custom_fields(), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] for item in items: - self.root.append(ACQUISITION_ENTRY(item, version, FM, updated, + self.root.append(ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS)) class CategoryFeed(NavFeed): @@ -384,7 +379,7 @@ class OPDSServer(object): cherrypy.response.headers['Last-Modified'] = self.last_modified(updated) cherrypy.response.headers['Content-Type'] = 'application/atom+xml;profile=opds-catalog' return str(AcquisitionFeed(updated, id_, items, offsets, - page_url, up_url, version, self.db.FIELD_MAP, self.db.field_metadata)) + page_url, up_url, version, self.db)) def opds_search(self, query=None, version=0, offset=0): try: diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py index 8715dda7d0..7f5bc31e70 100644 --- a/src/calibre/library/server/xml.py +++ b/src/calibre/library/server/xml.py @@ -102,31 +102,21 @@ class XMLServer(object): for key in CKEYS: def concat(name, val): return '%s:#:%s'%(name, unicode(val)) - val = record[CFM[key]['rec_index']] - if val: - datatype = CFM[key]['datatype'] - if datatype in ['comments']: - continue - k = str('CF_'+key[1:]) - name = CFM[key]['name'] - custcols.append(k) - if datatype == 'text' and CFM[key]['is_multiple']: - kwargs[k] = concat('#T#'+name, - format_tag_string(val,'|', - ignore_max=True)) - elif datatype == 'series': - kwargs[k] = concat(name, '%s [%s]'%(val, - fmt_sidx(record[CFM.cc_series_index_column_for(key)]))) - elif datatype == 'datetime': - kwargs[k] = concat(name, - format_date(val, CFM[key]['display'].get('date_format','dd MMM yyyy'))) - elif datatype == 'bool': - if val: - kwargs[k] = concat(name, __builtin__._('Yes')) - else: - kwargs[k] = concat(name, __builtin__._('No')) - else: - kwargs[k] = concat(name, val) + mi = self.db.get_metadata(record[CFM['id']['rec_index']], index_is_id=True) + name, val = mi.format_field(key) + if not val: + continue + datatype = CFM[key]['datatype'] + if datatype in ['comments']: + continue + k = str('CF_'+key[1:]) + name = CFM[key]['name'] + custcols.append(k) + if datatype == 'text' and CFM[key]['is_multiple']: + kwargs[k] = concat('#T#'+name, format_tag_string(val,',', + ignore_max=True)) + else: + kwargs[k] = concat(name, val) kwargs['custcols'] = ','.join(custcols) books.append(E.book(c, **kwargs)) From 7eaf417bb10e9d87038b47941c524ea9aa121ad2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 19 Sep 2010 07:47:03 +0100 Subject: [PATCH 046/235] Fix content server tags display problem --- resources/content_server/gui.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/content_server/gui.js b/resources/content_server/gui.js index afc21137e1..bd0743a854 100644 --- a/resources/content_server/gui.js +++ b/resources/content_server/gui.js @@ -84,7 +84,10 @@ function render_book(book) { } title += '' title += '' title += '

'+_('The template %s is invalid:')%tmpl + \ diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 71850abcd5..d5300d93e9 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -113,7 +113,10 @@ class SafeFormat(string.Formatter): safe_formatter = SafeFormat() def safe_format(x, format_args): - ans = safe_formatter.vformat(x, [], format_args).strip() + try: + ans = safe_formatter.vformat(x, [], format_args).strip() + except: + ans = '' return re.sub(r'\s+', ' ', ans) def get_components(template, mi, id, timefmt='%b %Y', length=250, From 89f64db891cfbc3c1ab276c87dc2eb8e826edb56 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 20 Sep 2010 09:51:04 +0100 Subject: [PATCH 056/235] Field interface, including refactoring (renaming) some existing methods. --- src/calibre/ebooks/metadata/book/base.py | 88 +++++++++++++++-------- src/calibre/gui2/dialogs/metadata_bulk.py | 4 +- src/calibre/gui2/library/models.py | 2 +- src/calibre/gui2/ui.py | 3 + src/calibre/library/caches.py | 2 +- src/calibre/library/database2.py | 36 ++++++++++ src/calibre/library/field_metadata.py | 46 +++++------- src/calibre/library/save_to_disk.py | 2 +- src/calibre/library/server/content.py | 2 +- 9 files changed, 123 insertions(+), 62 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 7b8eb07908..3d6d6b1bb8 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -138,20 +138,66 @@ class Metadata(object): def set(self, field, val, extra=None): self.__setattr__(field, val, extra) - @property - def all_keys(self): + # field-oriented interface. Intended to be the same as in LibraryDatabase + + def standard_field_keys(self): ''' - All attribute keys known by this instance, even if their value is None + return a list of all possible keys, even if this book doesn't have them + ''' + return STANDARD_METADATA_FIELDS + + def custom_field_keys(self): + ''' + return a list of the custom fields in this book + ''' + return object.__getattribute__(self, '_data')['user_metadata'].iterkeys() + + def all_field_keys(self): + ''' + All field keys known by this instance, even if their value is None ''' _data = object.__getattribute__(self, '_data') return frozenset(ALL_METADATA_FIELDS.union(_data['user_metadata'].iterkeys())) - @property + def metadata_for_field(self, key): + ''' + return metadata describing a standard or custom field. + ''' + if key in self.user_metadata_keys(): + return self.get_standard_metadata(self, key, make_copy=False) + return self.get_user_metadata(key, make_copy=False) + def user_metadata_keys(self): - 'The set of user metadata names this object knows about' + ''' + Return the standard keys actually in this book. + ''' _data = object.__getattribute__(self, '_data') return frozenset(_data['user_metadata'].iterkeys()) + def all_non_none_fields(self): + ''' + Return a dictionary containing all non-None metadata fields, including + the custom ones. + ''' + result = {} + _data = object.__getattribute__(self, '_data') + for attr in STANDARD_METADATA_FIELDS: + v = _data.get(attr, None) + if v is not None: + result[attr] = v + for attr in _data['user_metadata'].iterkeys(): + v = _data['user_metadata'][attr]['#value#'] + if v is not None: + result[attr] = v + if _data['user_metadata'][attr]['datatype'] == 'series': + result[attr+'_index'] = _data['user_metadata'][attr]['#extra#'] + return result + + # End of field-oriented interface + + # Extended interfaces. These permit one to get copies of metadata dictionaries, and to + # get and set custom field metadata + def get_standard_metadata(self, field, make_copy): ''' return field metadata from the field if it is there. Otherwise return @@ -237,30 +283,11 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') _data['user_metadata'][field] = metadata - def get_all_non_none_attributes(self): - ''' - Return a dictionary containing all non-None metadata fields, including - the custom ones. - ''' - result = {} - _data = object.__getattribute__(self, '_data') - for attr in STANDARD_METADATA_FIELDS: - v = _data.get(attr, None) - if v is not None: - result[attr] = v - for attr in _data['user_metadata'].iterkeys(): - v = _data['user_metadata'][attr]['#value#'] - if v is not None: - result[attr] = v - if _data['user_metadata'][attr]['datatype'] == 'series': - result[attr+'_index'] = _data['user_metadata'][attr]['#extra#'] - return result - # Old Metadata API {{{ def print_all_attributes(self): for x in STANDARD_METADATA_FIELDS: prints('%s:'%x, getattr(self, x, 'None')) - for x in self.user_metadata_keys: + for x in self.user_metadata_keys(): meta = self.get_user_metadata(x, make_copy=False) if meta is not None: prints(x, meta) @@ -326,7 +353,7 @@ class Metadata(object): self.cover_data = other.cover_data if getattr(other, 'user_metadata_keys', None): - for x in other.user_metadata_keys: + for x in other.user_metadata_keys(): meta = other.get_user_metadata(x, make_copy=True) if meta is not None: self_tags = self.get(x, []) @@ -389,7 +416,7 @@ class Metadata(object): ''' returns the tuple (field_name, formatted_value) ''' - if key in self.user_metadata_keys: + if key in self.user_metadata_keys(): res = self.get(key, None) cmeta = self.get_user_metadata(key, make_copy=False) if cmeta['datatype'] != 'composite' and (res is None or res == ''): @@ -432,6 +459,9 @@ class Metadata(object): return (None, None, None, None) + def expand_template(self, template): + return format_composite(template, self) + def __unicode__(self): from calibre.ebooks.metadata import authors_to_string ans = [] @@ -466,7 +496,7 @@ class Metadata(object): fmt('Published', isoformat(self.pubdate)) if self.rights is not None: fmt('Rights', unicode(self.rights)) - for key in self.user_metadata_keys: + for key in self.user_metadata_keys(): val = self.get(key, None) if val is not None: (name, val) = self.format_field(key) @@ -491,7 +521,7 @@ class Metadata(object): ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] if self.rights is not None: ans += [(_('Rights'), unicode(self.rights))] - for key in self.user_metadata_keys: + for key in self.user_metadata_keys(): val = self.get(key, None) if val is not None: (name, val) = self.format_field(key) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 1fb889757f..83cf6278e5 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -270,11 +270,11 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): def s_r_func(self, match): rfunc = self.s_r_functions[unicode(self.replace_func.currentText())] rtext = unicode(self.replace_with.text()) - mi_data = self.mi.get_all_non_none_attributes() + mi_data = self.mi.all_non_none_fields() def fm_func(m): try: - if m.group(3) not in self.mi.all_keys: return m.group(0) + if m.group(3) not in self.mi.all_field_keys(): return m.group(0) else: return '%s{%s}'%(m.group(1), m.group(3)) except: import traceback diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index be1bf9bc2d..6941869e44 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -319,7 +319,7 @@ class BooksModel(QAbstractTableModel): # {{{ _('Book %s of %s.')%\ (sidx, prepare_string_for_xml(series)) mi = self.db.get_metadata(idx) - for key in mi.user_metadata_keys: + for key in mi.user_metadata_keys(): name, val = mi.format_field(key) if val is not None: data[name] = val diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index f8d50d1cd2..647e31ff51 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -533,6 +533,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ # Save the current field_metadata for applications like calibre2opds # Goes here, because if cf is valid, db is valid. db.prefs['field_metadata'] = db.field_metadata.all_metadata() + if db.gm_count > 0: + print 'get_metadata cache: {0:d} calls, {1:4.2f}% misses'.format( + db.gm_count, (db.gm_missed*100.0)/db.gm_count) for action in self.iactions.values(): if not action.shutting_down(): return diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 770a362a1d..5f7fbdccc9 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -621,7 +621,7 @@ class ResultCache(SearchQueryParser): def multisort(self, fields=[], subsort=False): fields = [(self.sanitize_sort_field_name(x), bool(y)) for x, y in fields] - keys = self.field_metadata.sortable_keys() + keys = self.field_metadata.sortable_field_keys() fields = [x for x in fields if x[0] in keys] if subsort and 'sort' not in [x[0] for x in fields]: fields += [('sort', True)] diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 106b498ee8..f5a474edbc 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -325,6 +325,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.has_id = self.data.has_id self.count = self.data.count + # Count times get_metadata is called, and how many times in the cache + self.gm_count = 0 + self.gm_missed = 0 + for prop in ('author_sort', 'authors', 'comment', 'comments', 'isbn', 'publisher', 'rating', 'series', 'series_index', 'tags', 'title', 'timestamp', 'uuid', 'pubdate', 'ondevice'): @@ -520,15 +524,47 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): f.close() return ans + ### The field-style interface. These use field keys. + + def get_field(self, idx, key, default=None, index_is_id=False): + mi = self.get_metadata(idx, index_is_id=index_is_id, get_cover=True) + try: + return mi[key] + except: + return default + + def standard_field_keys(self): + return self.field_metadata.standard_field_keys() + + def custom_field_keys(self): + return self.field_metadata.custom_field_keys() + + def all_field_keys(self): + return self.field_metadata.all_field_keys() + + def sortable_field_keys(self): + return self.field_metadata.sortable_field_keys() + + def searchable_fields(self): + return self.field_metadata.searchable_field_keys() + + def search_term_to_field_key(self, term): + return self.field_metadata.search_term_to_key(term) + + def metadata_for_field(self, key): + return self.field_metadata[key] + def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' Convenience method to return metadata as a :class:`Metadata` object. ''' + self.gm_count += 1 mi = self.data.get(idx, self.FIELD_MAP['all_metadata'], row_is_id = index_is_id) if mi is not None: return mi + self.gm_missed += 1 mi = Metadata(None) self.data.set(idx, self.FIELD_MAP['all_metadata'], mi, row_is_id = index_is_id) diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index e4a4f5270d..a8031e5172 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -348,11 +348,24 @@ class FieldMetadata(dict): def keys(self): return self._tb_cats.keys() - def sortable_keys(self): + def sortable_field_keys(self): return [k for k in self._tb_cats.keys() if self._tb_cats[k]['kind']=='field' and self._tb_cats[k]['datatype'] is not None] + def standard_field_keys(self): + return [k for k in self._tb_cats.keys() + if self._tb_cats[k]['kind']=='field' and + not self._tb_cats[k]['is_custom']] + + def custom_field_keys(self): + return [k for k in self._tb_cats.keys() + if self._tb_cats[k]['kind']=='field' and + self._tb_cats[k]['is_custom']] + + def all_field_keys(self): + return [k for k in self._tb_cats.keys() if self._tb_cats[k]['kind']=='field'] + def iterkeys(self): for key in self._tb_cats: yield key @@ -474,36 +487,10 @@ class FieldMetadata(dict): key = self.custom_field_prefix+label self._tb_cats[key]['rec_index'] = index # let the exception fly ... - -# DEFAULT_LOCATIONS = frozenset([ -# 'all', -# 'author', # compatibility -# 'authors', -# 'comment', # compatibility -# 'comments', -# 'cover', -# 'date', -# 'format', # compatibility -# 'formats', -# 'isbn', -# 'ondevice', -# 'pubdate', -# 'publisher', -# 'search', -# 'series', -# 'rating', -# 'tag', # compatibility -# 'tags', -# 'title', -# ]) - def get_search_terms(self): s_keys = sorted(self._search_term_map.keys()) for v in self.search_items: s_keys.append(v) -# if set(s_keys) != self.DEFAULT_LOCATIONS: -# print 'search labels and default_locations do not match:' -# print set(s_keys) ^ self.DEFAULT_LOCATIONS return s_keys def _add_search_terms_to_map(self, key, terms): @@ -518,3 +505,8 @@ class FieldMetadata(dict): if term in self._search_term_map: return self._search_term_map[term] return term + + def searchable_field_keys(self): + return [k for k in self._tb_cats.keys() + if self._tb_cats[k]['kind']=='field' and + len(self._tb_cats[k]['search_terms']) > 0] diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index d5300d93e9..fe62dcb7fd 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -125,7 +125,7 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, library_order = tweaks['save_template_title_series_sorting'] == 'library_order' tsfmt = title_sort if library_order else lambda x: x format_args = FORMAT_ARGS.copy() - format_args.update(mi.get_all_non_none_attributes()) + format_args.update(mi.all_non_none_fields()) if mi.title: format_args['title'] = tsfmt(mi.title) if mi.authors: diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py index c3a662c0fd..041ea78051 100644 --- a/src/calibre/library/server/content.py +++ b/src/calibre/library/server/content.py @@ -56,7 +56,7 @@ class ContentServer(object): def sort(self, items, field, order): field = self.db.data.sanitize_sort_field_name(field) - if field not in self.db.field_metadata.sortable_keys(): + if field not in self.db.field_metadata.sortable_field_keys(): raise cherrypy.HTTPError(400, '%s is not a valid sort field'%field) keyg = CSSortKeyGenerator([(field, order)], self.db.field_metadata) items.sort(key=keyg, reverse=not order) From e721bd44eeb674b89346baf0ab13c053bd26e149 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 20 Sep 2010 14:52:53 +0100 Subject: [PATCH 057/235] Interim release --- src/calibre/gui2/dialogs/metadata_bulk.py | 248 ++++++++++++++-------- src/calibre/gui2/dialogs/metadata_bulk.ui | 152 +++++++++++-- src/calibre/library/database2.py | 5 +- 3 files changed, 294 insertions(+), 111 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 83cf6278e5..3659547b13 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -122,12 +122,20 @@ def format_composite(x, mi): class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): - s_r_functions = { - '' : lambda x: x, - _('Lower Case') : lambda x: x.lower(), - _('Upper Case') : lambda x: x.upper(), - _('Title Case') : lambda x: x.title(), - } + s_r_functions = { '' : lambda x: x, + _('Lower Case') : lambda x: x.lower(), + _('Upper Case') : lambda x: x.upper(), + _('Title Case') : lambda x: x.title(), + } + + s_r_match_modes = [ _('Character match'), + _('Regular Expression'), + ] + + s_r_replace_modes = [ _('Replace field'), + _('Prepend to field'), + _('Append to field'), + ] def __init__(self, window, rows, db): QDialog.__init__(self, window) @@ -179,27 +187,34 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): fields.sort() self.search_field.addItems(fields) self.search_field.setMaxVisibleItems(min(len(fields), 20)) + self.destination_field.addItems(fields) + self.destination_field.setMaxVisibleItems(min(len(fields), 20)) offset = 10 self.s_r_number_of_books = min(7, len(self.ids)) for i in range(1,self.s_r_number_of_books+1): w = QtGui.QLabel(self.tabWidgetPage3) w.setText(_('Book %d:')%i) - self.gridLayout1.addWidget(w, i+offset, 0, 1, 1) + self.testgrid.addWidget(w, i+offset, 0, 1, 1) w = QtGui.QLineEdit(self.tabWidgetPage3) w.setReadOnly(True) name = 'book_%d_text'%i setattr(self, name, w) self.book_1_text.setObjectName(name) - self.gridLayout1.addWidget(w, i+offset, 1, 1, 1) + self.testgrid.addWidget(w, i+offset, 1, 1, 1) w = QtGui.QLineEdit(self.tabWidgetPage3) w.setReadOnly(True) name = 'book_%d_result'%i setattr(self, name, w) self.book_1_text.setObjectName(name) - self.gridLayout1.addWidget(w, i+offset, 2, 1, 1) + self.testgrid.addWidget(w, i+offset, 2, 1, 1) self.s_r_heading.setText('

'+ - _('Search and replace in text fields using ' + _('You can destroy your library ' + 'using this feature. Changes are permanent. There ' + 'is no undo function. You are strongly encouraged ' + 'to back up your library before proceeding.' + ) + '

' + _( + 'Search and replace in text fields using ' 'regular expressions. The search text is an ' 'arbitrary python-compatible regular expression. ' 'The replacement text can contain backreferences ' @@ -209,51 +224,86 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): ' ' 'this reference ' 'for more information, and in particular the \'sub\' ' - 'function.') + '

' + _( - 'Note: you can destroy your library ' - 'using this feature. Changes are permanent. There ' - 'is no undo function. You are strongly encouraged ' - 'to back up your library before proceeding.')) + 'function.' + )) + self.search_mode.addItems(self.s_r_match_modes) + self.search_mode.setCurrentIndex(0) + self.replace_mode.addItems(self.s_r_replace_modes) + self.replace_mode.setCurrentIndex(0) + + self.s_r_search_mode = 0 self.s_r_error = None self.s_r_obj = None self.replace_func.addItems(sorted(self.s_r_functions.keys())) - self.search_field.currentIndexChanged[str].connect(self.s_r_field_changed) + self.search_mode.currentIndexChanged[int].connect(self.s_r_search_mode_changed) + self.search_field.currentIndexChanged[str].connect(self.s_r_search_field_changed) + self.destination_field.currentIndexChanged[str].connect(self.s_r_destination_field_changed) + + self.replace_mode.currentIndexChanged[int].connect(self.s_r_paint_results) self.replace_func.currentIndexChanged[str].connect(self.s_r_paint_results) self.search_for.editTextChanged[str].connect(self.s_r_paint_results) self.replace_with.editTextChanged[str].connect(self.s_r_paint_results) self.test_text.editTextChanged[str].connect(self.s_r_paint_results) + self.comma_separated.stateChanged.connect(self.s_r_paint_results) + self.case_sensitive.stateChanged.connect(self.s_r_paint_results) self.central_widget.setCurrentIndex(0) self.search_for.completer().setCaseSensitivity(Qt.CaseSensitive) self.replace_with.completer().setCaseSensitivity(Qt.CaseSensitive) + self.s_r_search_mode_changed(0) - def s_r_field_changed(self, txt): + def s_r_get_field(self, mi, field): + if field: + fm = self.db.metadata_for_field(field) + val = mi.get(field, None) + if val is None: + val = [] + elif not fm['is_multiple']: + val = [val] + elif field == 'authors': + val = [v.replace(',', '|') for v in val] + else: + val = [] + return val + + def s_r_search_field_changed(self, txt): txt = unicode(txt) for i in range(0, self.s_r_number_of_books): - if txt: - fm = self.db.field_metadata[txt] - id = self.ids[i] - val = self.db.get_property(id, index_is_id=True, - loc=fm['rec_index']) - if val is None: - val = '' - if fm['is_multiple']: - val = [t.strip() for t in val.split(fm['is_multiple']) if t.strip()] - if val: - val.sort(cmp=lambda x,y: cmp(x.lower(), y.lower())) - val = val[0] - if txt == 'authors': - val = val.replace('|', ',') - else: - val = '' - else: - val = '' w = getattr(self, 'book_%d_text'%(i+1)) - w.setText(val) + mi = self.db.get_metadata(self.ids[i], index_is_id=True) + src = unicode(self.search_field.currentText()) + t = self.s_r_get_field(mi, src) + w.setText(''.join(t[0:1])) self.s_r_paint_results(None) + def s_r_destination_field_changed(self, txt): + txt = unicode(txt) + self.comma_separated.setEnabled(True) + if txt: + fm = self.db.metadata_for_field(txt) + if fm['is_multiple']: + self.comma_separated.setEnabled(False) + self.comma_separated.setChecked(True) + self.s_r_paint_results(None) + + def s_r_search_mode_changed(self, val): + if val == 0: + self.destination_field.setCurrentIndex(0) + self.destination_field.setVisible(False) + self.destination_field_label.setVisible(False) + self.replace_mode.setCurrentIndex(0) + self.replace_mode.setVisible(False) + self.replace_mode_label.setVisible(False) + self.comma_separated.setVisible(False) + else: + self.destination_field.setVisible(True) + self.destination_field_label.setVisible(True) + self.replace_mode.setVisible(True) + self.replace_mode_label.setVisible(True) + self.comma_separated.setVisible(True) + def s_r_set_colors(self): if self.s_r_error is not None: col = 'rgb(255, 0, 0, 20%)' @@ -265,32 +315,66 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): for i in range(0,self.s_r_number_of_books): getattr(self, 'book_%d_result'%(i+1)).setText('') - field_match_re = re.compile(r'(^|[^\\])(\\g<)([^>]+)(>)') - def s_r_func(self, match): rfunc = self.s_r_functions[unicode(self.replace_func.currentText())] rtext = unicode(self.replace_with.text()) - mi_data = self.mi.all_non_none_fields() - - def fm_func(m): - try: - if m.group(3) not in self.mi.all_field_keys(): return m.group(0) - else: return '%s{%s}'%(m.group(1), m.group(3)) - except: - import traceback - traceback.print_exc() - return m.group(0) - - rtext = re.sub(self.field_match_re, fm_func, rtext) rtext = match.expand(rtext) - rtext = format_composite(rtext, mi_data) return rfunc(rtext) + def s_r_do_regexp(self, mi): + src_field = unicode(self.search_field.currentText()) + src = self.s_r_get_field(mi, src_field) + result = [] + for s in src: + result.append(self.s_r_obj.sub(self.s_r_func, s)) + return result + + def s_r_do_destination(self, mi, val): + src = unicode(self.search_field.currentText()) + if src == '': + return '' + dest = unicode(self.destination_field.currentText()) + if dest == '': + dest = src + dest_mode = self.replace_mode.currentIndex() + + if dest_mode != 0: + dest_val = mi.get(dest, '') + if dest_val is None: + dest_val = [] + elif isinstance(dest_val, list): + if dest == 'authors': + dest_val = [v.replace(',', '|') for v in dest_val] + else: + dest_val = [dest_val] + else: + dest_val = [] + + if len(val) > 0: + if src == 'authors': + val = [v.replace(',', '|') for v in val] + if dest_mode == 1: + val.extend(dest_val) + elif dest_mode == 2: + val[0:0] = dest_val + return val + + def s_r_replace_mode_separator(self): + if self.comma_separated.isChecked(): + return ',' + return '' + def s_r_paint_results(self, txt): self.s_r_error = None self.s_r_set_colors() + + if self.case_sensitive.isChecked(): + flags = 0 + else: + flags = re.I + try: - self.s_r_obj = re.compile(unicode(self.search_for.text())) + self.s_r_obj = re.compile(unicode(self.search_for.text()), flags) except Exception as e: self.s_r_obj = None self.s_r_error = e @@ -298,7 +382,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): return try: - self.mi = MetaInformation(None, None) self.test_result.setText(self.s_r_obj.sub(self.s_r_func, unicode(self.test_text.text()))) except Exception as e: @@ -307,60 +390,53 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): return for i in range(0,self.s_r_number_of_books): - id = self.ids[i] - self.mi = self.db.get_metadata(id, index_is_id=True) - wt = getattr(self, 'book_%d_text'%(i+1)) + mi = self.db.get_metadata(self.ids[i], index_is_id=True) wr = getattr(self, 'book_%d_result'%(i+1)) try: - wr.setText(self.s_r_obj.sub(self.s_r_func, unicode(wt.text()))) + result = self.s_r_do_regexp(mi) + t = self.s_r_do_destination(mi, result[0:1]) + t = self.s_r_replace_mode_separator().join(t) + wr.setText(t) except Exception as e: + import traceback + traceback.print_exc() self.s_r_error = e self.s_r_set_colors() break def do_search_replace(self): - field = unicode(self.search_field.currentText()) - if not field or not self.s_r_obj: + source = unicode(self.search_field.currentText()) + if not source or not self.s_r_obj: return - - fm = self.db.field_metadata[field] - - def apply_pattern(val): - try: - return self.s_r_obj.sub(self.s_r_func, val) - except: - return val + dest = unicode(self.destination_field.currentText()) + if not dest: + dest = source + dfm = self.db.field_metadata[source] for id in self.ids: - val = self.db.get_property(id, index_is_id=True, - loc=fm['rec_index']) + mi = self.db.get_metadata(id, index_is_id=True,) + val = mi.get(source) if val is None: continue - if fm['is_multiple']: - res = [] - for val in [t.strip() for t in val.split(fm['is_multiple'])]: - v = apply_pattern(val).strip() - if v: - res.append(v) - val = res - if fm['is_custom']: + val = self.s_r_do_regexp(mi) + val = self.s_r_do_destination(mi, val) + if dfm['is_multiple']: + if dfm['is_custom']: # The standard tags and authors values want to be lists. # All custom columns are to be strings - val = fm['is_multiple'].join(val) - elif field == 'authors': - val = [v.replace('|', ',') for v in val] + val = dfm['is_multiple'].join(val) else: - val = apply_pattern(val) + val = self.s_r_replace_mode_separator().join(val) - if fm['is_custom']: - extra = self.db.get_custom_extra(id, label=fm['label'], index_is_id=True) - self.db.set_custom(id, val, label=fm['label'], extra=extra, + if dfm['is_custom']: + extra = self.db.get_custom_extra(id, label=dfm['label'], index_is_id=True) + self.db.set_custom(id, val, label=dfm['label'], extra=extra, commit=False) else: - if field == 'comments': + if dest == 'comments': setter = self.db.set_comment else: - setter = getattr(self.db, 'set_'+field) + setter = getattr(self.db, 'set_'+dest) setter(id, val, notify=False, commit=False) self.db.commit() diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index aca7b0cb75..e433aaf327 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -319,7 +319,7 @@ Future conversion of these books will use the default settings. &Search and replace (experimental) - + QLayout::SetMinimumSize @@ -351,6 +351,39 @@ Future conversion of these books will use the default settings. + + + + + + + + Search mode: + + + search_field + + + + + + + + + + Qt::Horizontal + + + + 20 + 10 + + + + + + + &Search for: @@ -360,7 +393,20 @@ Future conversion of these books will use the default settings. - + + + + + + + Case sensitive + + + true + + + + &Replace with: @@ -370,29 +416,93 @@ Future conversion of these books will use the default settings. - - - - - - - + - - + + + + + + Apply function after replace: + + + replace_func + + + + + + + + + + Qt::Horizontal + + + + 20 + 10 + + + + + + + + - Apply function &after replace: + &Destination field: - replace_func + destination_field - - - + + + + + + + + Mode: + + + replace_mode + + + + + + + + + + use comma + + + true + + + + + + + Qt::Horizontal + + + + 20 + 10 + + + + + + + Test &text @@ -402,8 +512,8 @@ Future conversion of these books will use the default settings. - - + + Test re&sult @@ -412,17 +522,17 @@ Future conversion of these books will use the default settings. - + Your test: - + - + diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index f5a474edbc..2f9f9b6f89 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -528,10 +528,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def get_field(self, idx, key, default=None, index_is_id=False): mi = self.get_metadata(idx, index_is_id=index_is_id, get_cover=True) - try: - return mi[key] - except: - return default + return mi.get(key, default) def standard_field_keys(self): return self.field_metadata.standard_field_keys() From ea44e9053faf49c85df6d7e6abf8392ef37ffd12 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 20 Sep 2010 17:03:53 +0100 Subject: [PATCH 058/235] Finish search and replace. Fix a bug in database2 that seems to be triggered by interactions with the cover cache. --- src/calibre/gui2/dialogs/metadata_bulk.py | 60 +++++++++++++---------- src/calibre/library/database2.py | 23 ++++++--- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 3659547b13..b01869deaa 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -11,11 +11,11 @@ from PyQt4 import QtGui from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog from calibre.gui2.dialogs.tag_editor import TagEditor -from calibre.ebooks.metadata import string_to_authors, \ - authors_to_string, MetaInformation +from calibre.ebooks.metadata import string_to_authors, authors_to_string from calibre.gui2.custom_column_widgets import populate_metadata_page from calibre.gui2.dialogs.progress import BlockingBusy from calibre.gui2 import error_dialog, Dispatcher +from calibre.utils.config import dynamic class Worker(Thread): @@ -208,26 +208,27 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.book_1_text.setObjectName(name) self.testgrid.addWidget(w, i+offset, 2, 1, 1) - self.s_r_heading.setText('

'+ - _('You can destroy your library ' - 'using this feature. Changes are permanent. There ' - 'is no undo function. You are strongly encouraged ' - 'to back up your library before proceeding.' - ) + '

' + _( - 'Search and replace in text fields using ' - 'regular expressions. The search text is an ' - 'arbitrary python-compatible regular expression. ' - 'The replacement text can contain backreferences ' - 'to parenthesized expressions in the pattern. ' - 'The search is not anchored, and can match and ' - 'replace multiple times on the same string. See ' - ' ' - 'this reference ' - 'for more information, and in particular the \'sub\' ' - 'function.' - )) + self.s_r_heading.setText('

'+ _( + 'You can destroy your library using this feature. ' + 'Changes are permanent. There is no undo function. ' + ' This feature is experimental, and there may be bugs. ' + 'You are strongly encouraged to back up your library ' + 'before proceeding.' + ) + '

' + _( + 'Search and replace in text fields using character matching ' + 'or regular expressions. In character mode, search text ' + 'found in the specified field is replaced with replace ' + 'text. In regular expression mode, the search text is an ' + 'arbitrary python-compatible regular expression. The ' + 'replacement text can contain backreferences to parenthesized ' + 'expressions in the pattern. The search is not anchored, ' + 'and can match and replace multiple times on the same string. ' + 'See ' + 'this reference for more information, and in particular ' + 'the \'sub\' function.' + )) self.search_mode.addItems(self.s_r_match_modes) - self.search_mode.setCurrentIndex(0) + self.search_mode.setCurrentIndex(dynamic.get('s_r_search_mode', 0)) self.replace_mode.addItems(self.s_r_replace_modes) self.replace_mode.setCurrentIndex(0) @@ -252,7 +253,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.search_for.completer().setCaseSensitivity(Qt.CaseSensitive) self.replace_with.completer().setCaseSensitivity(Qt.CaseSensitive) - self.s_r_search_mode_changed(0) + self.s_r_search_mode_changed(self.search_mode.currentIndex()) def s_r_get_field(self, mi, field): if field: @@ -303,6 +304,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.replace_mode.setVisible(True) self.replace_mode_label.setVisible(True) self.comma_separated.setVisible(True) + self.s_r_paint_results(None) def s_r_set_colors(self): if self.s_r_error is not None: @@ -325,8 +327,12 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): src_field = unicode(self.search_field.currentText()) src = self.s_r_get_field(mi, src_field) result = [] + rfunc = self.s_r_functions[unicode(self.replace_func.currentText())] for s in src: - result.append(self.s_r_obj.sub(self.s_r_func, s)) + t = self.s_r_obj.sub(self.s_r_func, s) + if self.search_mode.currentIndex() == 0: + t = rfunc(t) + result.append(t) return result def s_r_do_destination(self, mi, val): @@ -374,7 +380,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): flags = re.I try: - self.s_r_obj = re.compile(unicode(self.search_for.text()), flags) + if self.search_mode.currentIndex() == 0: + self.s_r_obj = re.compile(re.escape(unicode(self.search_for.text())), flags) + else: + self.s_r_obj = re.compile(unicode(self.search_for.text()), flags) except Exception as e: self.s_r_obj = None self.s_r_error = e @@ -411,7 +420,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): dest = unicode(self.destination_field.currentText()) if not dest: dest = source - dfm = self.db.field_metadata[source] + dfm = self.db.field_metadata[dest] for id in self.ids: mi = self.db.get_metadata(id, index_is_id=True,) @@ -439,6 +448,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): setter = getattr(self.db, 'set_'+dest) setter(id, val, notify=False, commit=False) self.db.commit() + dynamic['s_r_search_mode'] = self.search_mode.currentIndex() def create_custom_column_editors(self): w = self.central_widget.widget(1) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 2f9f9b6f89..c1ada94a84 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -464,11 +464,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # change case don't cause any changes to the directories in the file # system. This can lead to having the directory names not match the # title/author, which leads to trouble when libraries are copied to - # a case-sensitive system. The following code fixes this by checking - # each segment. If they are different because of case, then rename - # the segment to some temp file name, then rename it back to the - # correct name. Note that the code above correctly handles files in - # the directories, so no need to do them here. + # a case-sensitive system. The following code attempts to fix this + # by checking each segment. If they are different because of case, + # then rename the segment to some temp file name, then rename it + # back to the correct name. Note that the code above correctly + # handles files in the directories, so no need to do them here. for oldseg, newseg in zip(c1, c2): if oldseg.lower() == newseg.lower() and oldseg != newseg: while True: @@ -476,8 +476,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): tempname = os.path.join(curpath, 'TEMP.%f'%time.time()) if not os.path.exists(tempname): break - os.rename(os.path.join(curpath, oldseg), tempname) - os.rename(tempname, os.path.join(curpath, newseg)) + try: + os.rename(os.path.join(curpath, oldseg), tempname) + except (IOError, OSError): + # Windows (at least) sometimes refuses to do the rename + # probably because a file such a cover is open in the + # hierarchy. Just go on -- nothing is hurt beyond the + # case of the filesystem not matching the case in + # name stored by calibre + print 'rename of library component failed' + else: + os.rename(tempname, os.path.join(curpath, newseg)) curpath = os.path.join(curpath, newseg) def add_listener(self, listener): From e2f4b969bc6d36fbb285818cb50184cf83efed6e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 20 Sep 2010 19:49:03 +0100 Subject: [PATCH 059/235] 1) add tooltips 2) change main heading text depending on the mode 3) add an error if attempting to assign '' to authors or title --- src/calibre/gui2/dialogs/metadata_bulk.py | 48 +++++++++++++++++---- src/calibre/gui2/dialogs/metadata_bulk.ui | 52 +++++++++++++++++++---- 2 files changed, 84 insertions(+), 16 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index b01869deaa..681f65b19e 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -208,25 +208,43 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.book_1_text.setObjectName(name) self.testgrid.addWidget(w, i+offset, 2, 1, 1) - self.s_r_heading.setText('

'+ _( + self.main_heading = _( 'You can destroy your library using this feature. ' 'Changes are permanent. There is no undo function. ' ' This feature is experimental, and there may be bugs. ' 'You are strongly encouraged to back up your library ' 'before proceeding.' - ) + '

' + _( + + '

' + 'Search and replace in text fields using character matching ' - 'or regular expressions. In character mode, search text ' - 'found in the specified field is replaced with replace ' - 'text. In regular expression mode, the search text is an ' + 'or regular expressions. ') + + self.character_heading = _( + 'In character mode, the field is searched for the entered ' + 'search text. The text is replaced by the specified replacement ' + 'text everywhere it is found in the specified field. After ' + 'replacement is finished, the text can be changed to ' + 'upper-case, lower-case, or title-case. If the case-sensitive ' + 'check box is checked, the search text must match exactly. If ' + 'it is unchecked, the search text will match both upper- and ' + 'lower-case letters' + ) + + self.regexp_heading = _( + 'In regular expression mode, the search text is an ' 'arbitrary python-compatible regular expression. The ' 'replacement text can contain backreferences to parenthesized ' 'expressions in the pattern. The search is not anchored, ' 'and can match and replace multiple times on the same string. ' + 'The modification functions (lower-case etc) are applied to the ' + 'matched text, not to the field as a whole. ' + 'The destination box specifies the field where the result after ' + 'matching and replacement is to be assigned. You can replace ' + 'the text in the field, or prepend or append the matched text. ' 'See ' - 'this reference for more information, and in particular ' - 'the \'sub\' function.' - )) + 'this reference for more information on python\'s regular ' + 'expressions, and in particular the \'sub\' function.' + ) + self.search_mode.addItems(self.s_r_match_modes) self.search_mode.setCurrentIndex(dynamic.get('s_r_search_mode', 0)) self.replace_mode.addItems(self.s_r_replace_modes) @@ -298,12 +316,14 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.replace_mode.setVisible(False) self.replace_mode_label.setVisible(False) self.comma_separated.setVisible(False) + self.s_r_heading.setText('

'+self.main_heading + self.character_heading) else: self.destination_field.setVisible(True) self.destination_field_label.setVisible(True) self.replace_mode.setVisible(True) self.replace_mode_label.setVisible(True) self.comma_separated.setVisible(True) + self.s_r_heading.setText('

'+self.main_heading + self.regexp_heading) self.s_r_paint_results(None) def s_r_set_colors(self): @@ -434,8 +454,20 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): # The standard tags and authors values want to be lists. # All custom columns are to be strings val = dfm['is_multiple'].join(val) + if dest == 'authors' and len(val) == 0: + error_dialog(self, _('Search/replace invalid'), + _('Authors cannot be set to the empty string. ' + 'Book title %s not processed')%mi.title, + show=True) + continue else: val = self.s_r_replace_mode_separator().join(val) + if dest == 'title' and len(val) == 0: + error_dialog(self, _('Search/replace invalid'), + _('Title cannot be set to the empty string. ' + 'Book title %s not processed')%mi.title, + show=True) + continue if dfm['is_custom']: extra = self.db.get_custom_extra(id, label=dfm['label'], index_is_id=True) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index e433aaf327..b2a3e11b4a 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -351,7 +351,11 @@ Future conversion of these books will use the default settings. - + + + The name of the field that you want to search + + @@ -361,12 +365,16 @@ Future conversion of these books will use the default settings. Search mode: - search_field + search_mode - + + + Choose whether to use basic text matching or advanced regular expression matching + + @@ -394,7 +402,11 @@ Future conversion of these books will use the default settings. - + + + Enter the what you are looking for, either plain text or a regular expression, depending on the mode + + @@ -404,6 +416,9 @@ Future conversion of these books will use the default settings. true + + Check this box if the search string must match exactly upper and lower case. Uncheck it if case is to be ignored + @@ -417,7 +432,11 @@ Future conversion of these books will use the default settings. - + + + The replacement text. The matched search text will be replaced with this string + + @@ -432,7 +451,12 @@ Future conversion of these books will use the default settings. - + + + Specify how the text is to be processed after matching and replacement. In character mode, the entire +field is processed. In regular expression mode, only the matched text is processed + + @@ -460,7 +484,11 @@ Future conversion of these books will use the default settings. - + + + The field that the text will be put into after all replacements. If blank, the source field is used. + + @@ -475,7 +503,11 @@ Future conversion of these books will use the default settings. - + + + Specify how the text should be copied into the destination. + + @@ -485,6 +517,10 @@ Future conversion of these books will use the default settings. true + + If the replace mode is prepend or append, then this box indicates whether a comma or +nothing should be put between the original text and the inserted text + From 57a8705ec1b869d97d04ceab75db9caf1426faad Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 13:27:55 -0600 Subject: [PATCH 060/235] Don't maintain a separate prompt buffer --- src/calibre/utils/pyconsole/editor.py | 49 +++++++++++++++------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/calibre/utils/pyconsole/editor.py b/src/calibre/utils/pyconsole/editor.py index 68b83539f2..431a10eda5 100644 --- a/src/calibre/utils/pyconsole/editor.py +++ b/src/calibre/utils/pyconsole/editor.py @@ -58,7 +58,6 @@ class Editor(QTextEdit): QTextEdit.__init__(self, parent) self.buf = '' self.prompt_frame = None - self.current_prompt = [''] self.allow_output = False self.prompt_frame_format = QTextFrameFormat() self.prompt_frame_format.setBorder(1) @@ -84,11 +83,21 @@ class Editor(QTextEdit): self.interpreter = Interpreter(parent=self) self.interpreter.show_error.connect(self.show_error) - #it = self.prompt_frame.begin() - #while not it.atEnd(): - # bl = it.currentBlock() - # prints(repr(bl.text())) - # it += 1 + print list(self.prompt()) + + + def prompt(self, strip_prompt_strings=True): + if not self.prompt_frame: + yield u'' if strip_prompt_strings else self.formatter.prompt + else: + it = self.prompt_frame.begin() + while not it.atEnd(): + bl = it.currentBlock() + t = unicode(bl.text()) + if strip_prompt_strings: + t = t[self.prompt_len:] + yield t + it += 1 # Rendering {{{ @@ -113,15 +122,16 @@ class Editor(QTextEdit): c.setPosition(self.prompt_frame.firstPosition()) def render_current_prompt(self): + cp = list(self.prompt()) self.clear_current_prompt() - for i, line in enumerate(self.current_prompt): + for i, line in enumerate(cp): start = i == 0 - end = i == len(self.current_prompt) - 1 + end = i == len(cp) - 1 self.formatter.render_prompt(not start, self.cursor) self.formatter.render(self.lexer.get_tokens(line), self.cursor) if not end: - self.cursor.insertText('\n') + self.cursor.insertBlock() def show_error(self, is_syntax_err, tb): if self.prompt_frame is not None: @@ -194,32 +204,29 @@ class Editor(QTextEdit): def enter_pressed(self): if self.prompt_frame is None: return - if self.current_prompt[0]: + cp = list(self.prompt()) + if cp[0]: c = self.root_frame.lastCursorPosition() self.setTextCursor(c) old_pf = self.prompt_frame self.prompt_frame = None oldbuf = self.buf self.buf = '' - ret = self.interpreter.runsource('\n'.join(self.current_prompt)) + ret = self.interpreter.runsource('\n'.join(cp)) if ret: # Incomplete command self.buf = oldbuf self.prompt_frame = old_pf - self.current_prompt.append('') + c = old_pf.lastCursorPosition() + c.insertBlock() + self.setTextCursor(c) else: # Command completed - self.current_prompt = [''] old_pf.setFrameFormat(QTextFrameFormat()) self.render_current_prompt() def text_typed(self, text): - if not self.current_prompt[0]: - self.cursor.beginEditBlock() - else: - self.cursor.joinPreviousEditBlock() - self.current_prompt[-1] += text - self.render_current_prompt() - self.cursor.endEditBlock() - + if self.prompt_frame is not None: + self.cursor.insertText(text) + self.render_current_prompt() # }}} From 111c73ab80549913cc405d86d09ca69ef648e583 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 13:46:11 -0600 Subject: [PATCH 061/235] ... --- .../utils/pyconsole/{editor.py => console.py} | 31 ++++++++++++------- src/calibre/utils/pyconsole/main.py | 4 +-- 2 files changed, 21 insertions(+), 14 deletions(-) rename src/calibre/utils/pyconsole/{editor.py => console.py} (96%) diff --git a/src/calibre/utils/pyconsole/editor.py b/src/calibre/utils/pyconsole/console.py similarity index 96% rename from src/calibre/utils/pyconsole/editor.py rename to src/calibre/utils/pyconsole/console.py index 431a10eda5..d95e86c7ef 100644 --- a/src/calibre/utils/pyconsole/editor.py +++ b/src/calibre/utils/pyconsole/console.py @@ -29,7 +29,7 @@ class EditBlock(object): # {{{ self.cursor.endEditBlock() # }}} -class Editor(QTextEdit): +class Console(QTextEdit): @property def doc(self): @@ -86,6 +86,8 @@ class Editor(QTextEdit): print list(self.prompt()) + # Prompt management {{{ + def prompt(self, strip_prompt_strings=True): if not self.prompt_frame: yield u'' if strip_prompt_strings else self.formatter.prompt @@ -99,15 +101,8 @@ class Editor(QTextEdit): yield t it += 1 - - # Rendering {{{ - - def render_block(self, text, restore_prompt=True): - self.formatter.render(self.lexer.get_tokens(text), self.cursor) - self.cursor.insertBlock() - self.cursor.movePosition(self.cursor.End) - if restore_prompt: - self.render_current_prompt() + def set_prompt(self, lines): + self.render_current_prompt(lines) def clear_current_prompt(self): if self.prompt_frame is None: @@ -121,8 +116,8 @@ class Editor(QTextEdit): c.removeSelectedText() c.setPosition(self.prompt_frame.firstPosition()) - def render_current_prompt(self): - cp = list(self.prompt()) + def render_current_prompt(self, lines=None): + cp = list(self.prompt()) if lines is None else lines self.clear_current_prompt() for i, line in enumerate(cp): @@ -133,6 +128,18 @@ class Editor(QTextEdit): if not end: self.cursor.insertBlock() + # }}} + + + # Non-prompt Rendering {{{ + + def render_block(self, text, restore_prompt=True): + self.formatter.render(self.lexer.get_tokens(text), self.cursor) + self.cursor.insertBlock() + self.cursor.movePosition(self.cursor.End) + if restore_prompt: + self.render_current_prompt() + def show_error(self, is_syntax_err, tb): if self.prompt_frame is not None: # At a prompt, so redirect output diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index c2694aae5f..af99ec66bb 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -10,7 +10,7 @@ from PyQt4.Qt import QMainWindow, QToolBar, QStatusBar, QLabel, QFont, Qt, \ QApplication from calibre.constants import __appname__, __version__ -from calibre.utils.pyconsole.editor import Editor +from calibre.utils.pyconsole.console import Console class MainWindow(QMainWindow): @@ -37,7 +37,7 @@ class MainWindow(QMainWindow): self.tool_bar.setToolButtonStyle(Qt.ToolButtonTextOnly) # }}} - self.editor = Editor(parent=self) + self.editor = Console(parent=self) self.setCentralWidget(self.editor) From f770aa43bbf4a175cb614e437694732361209637 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 14:24:42 -0600 Subject: [PATCH 062/235] Left and right arrow keys work --- src/calibre/utils/pyconsole/console.py | 64 ++++++++++++++++++-------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index d95e86c7ef..73a19e7958 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -45,18 +45,30 @@ class Console(QTextEdit): @property def cursor_pos(self): - pass - #pos = self.cursor.position() - self.prompt_frame.firstPosition() - #i = 0 - #for line in self.current_prompt: - # i += self.prompt_len + ''' + Return cursor position in prompt frame as (row, col). + row starts at 0 for the first line + col is 0 if the cursor is at the start of the line, 1 if it is after + the first character, n if it is after the nth char. + ''' + if self.prompt_frame is not None: + pos = self.cursor.position() + it = self.prompt_frame.begin() + lineno = 0 + while not it.atEnd(): + bl = it.currentBlock() + if bl.contains(pos): + return (lineno, pos - bl.position()) + it += 1 + lineno += 1 + return (-1, -1) def __init__(self, prompt='>>> ', continuation='... ', parent=None): QTextEdit.__init__(self, parent) - self.buf = '' + self.buf = [] self.prompt_frame = None self.allow_output = False self.prompt_frame_format = QTextFrameFormat() @@ -130,7 +142,6 @@ class Console(QTextEdit): # }}} - # Non-prompt Rendering {{{ def render_block(self, text, restore_prompt=True): @@ -143,26 +154,25 @@ class Console(QTextEdit): def show_error(self, is_syntax_err, tb): if self.prompt_frame is not None: # At a prompt, so redirect output - return prints(tb) + return prints(tb, end='') try: - self.buf += tb + self.buf.append(tb) if is_syntax_err: self.formatter.render_syntax_error(tb, self.cursor) else: self.formatter.render(self.tb_lexer.get_tokens(tb), self.cursor) except: - prints(tb) + prints(tb, end='') def show_output(self, raw): if self.prompt_frame is not None: # At a prompt, so redirect output - return prints(raw) + return prints(raw, end='') try: - self.current_prompt_range = None - self.buf += raw + self.buf.append(raw) self.formatter.render_raw(raw, self.cursor) except: - prints(raw) + prints(raw, end='') # }}} @@ -187,13 +197,29 @@ class Console(QTextEdit): QTextEdit.keyPressEvent(self, ev) def left_pressed(self): - pass + lineno, pos = self.cursor_pos + if lineno < 0: return + if pos > self.prompt_len: + c = self.cursor + c.movePosition(c.PreviousCharacter) + self.setTextCursor(c) + elif lineno > 0: + c = self.cursor + c.movePosition(c.Up) + c.movePosition(c.EndOfLine) + self.setTextCursor(c) def right_pressed(self): - if self.prompt_frame is not None: - c = self.cursor + lineno, pos = self.cursor_pos + if lineno < 0: return + c = self.cursor + lineno, pos = self.cursor_pos + cp = list(self.prompt(False)) + if pos < len(cp[lineno]): c.movePosition(c.NextCharacter) - self.setTextCursor(c) + elif lineno < len(cp)-1: + c.movePosition(c.NextCharacter, n=1+self.prompt_len) + self.setTextCursor(c) def home_pressed(self): if self.prompt_frame is not None: @@ -218,7 +244,7 @@ class Console(QTextEdit): old_pf = self.prompt_frame self.prompt_frame = None oldbuf = self.buf - self.buf = '' + self.buf = [] ret = self.interpreter.runsource('\n'.join(cp)) if ret: # Incomplete command self.buf = oldbuf From acec240ef8a8ad5be4a02deb52e7eb72f01bfa0f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 20 Sep 2010 21:48:52 +0100 Subject: [PATCH 063/235] Add scroll bar. Increase number of books to 10 --- src/calibre/gui2/dialogs/metadata_bulk.py | 2 +- src/calibre/gui2/dialogs/metadata_bulk.ui | 42 +++++++++++++++++------ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 681f65b19e..7122fe14fa 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -190,7 +190,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.destination_field.addItems(fields) self.destination_field.setMaxVisibleItems(min(len(fields), 20)) offset = 10 - self.s_r_number_of_books = min(7, len(self.ids)) + self.s_r_number_of_books = min(10, len(self.ids)) for i in range(1,self.s_r_number_of_books+1): w = QtGui.QLabel(self.tabWidgetPage3) w.setText(_('Book %d:')%i) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index ec5a952346..f28f3fb57c 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -319,7 +319,7 @@ Future conversion of these books will use the default settings. &Search and replace (experimental) - + QLayout::SetMinimumSize @@ -406,6 +406,12 @@ Future conversion of these books will use the default settings. Enter the what you are looking for, either plain text or a regular expression, depending on the mode + + + 100 + 0 + + @@ -558,19 +564,33 @@ nothing should be put between the original text and the inserted text - - - - Your test: + + + + QFrame::NoFrame + + true + + + + + + + Your test: + + + + + + + + + + + - - - - - - From 4b981a5257be82a9f4cfaeb8fca32f48f54dc7d0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 14:58:24 -0600 Subject: [PATCH 064/235] Inserting, not just appending text now works --- src/calibre/utils/pyconsole/console.py | 68 +++++++++++++++++--------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 73a19e7958..19a24dfdd7 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -43,25 +43,6 @@ class Console(QTextEdit): def root_frame(self): return self.doc.rootFrame() - @property - def cursor_pos(self): - ''' - Return cursor position in prompt frame as (row, col). - row starts at 0 for the first line - col is 0 if the cursor is at the start of the line, 1 if it is after - the first character, n if it is after the nth char. - ''' - if self.prompt_frame is not None: - pos = self.cursor.position() - it = self.prompt_frame.begin() - lineno = 0 - while not it.atEnd(): - bl = it.currentBlock() - if bl.contains(pos): - return (lineno, pos - bl.position()) - it += 1 - lineno += 1 - return (-1, -1) def __init__(self, prompt='>>> ', @@ -95,11 +76,48 @@ class Console(QTextEdit): self.interpreter = Interpreter(parent=self) self.interpreter.show_error.connect(self.show_error) - print list(self.prompt()) - # Prompt management {{{ + @dynamic_property + def cursor_pos(self): + doc = ''' + The cursor position in the prompt has the form (row, col). + row starts at 0 for the first line + col is 0 if the cursor is at the start of the line, 1 if it is after + the first character, n if it is after the nth char. + ''' + + def fget(self): + if self.prompt_frame is not None: + pos = self.cursor.position() + it = self.prompt_frame.begin() + lineno = 0 + while not it.atEnd(): + bl = it.currentBlock() + if bl.contains(pos): + return (lineno, pos - bl.position()) + it += 1 + lineno += 1 + return (-1, -1) + + def fset(self, val): + row, col = val + if self.prompt_frame is not None: + it = self.prompt_frame.begin() + lineno = 0 + while not it.atEnd(): + if lineno == row: + c = self.cursor + c.setPosition(it.currentBlock().position()) + c.movePosition(c.NextCharacter, n=col) + self.setTextCursor(c) + break + it += 1 + lineno += 1 + + return property(fget=fget, fset=fset, doc=doc) + def prompt(self, strip_prompt_strings=True): if not self.prompt_frame: yield u'' if strip_prompt_strings else self.formatter.prompt @@ -128,7 +146,8 @@ class Console(QTextEdit): c.removeSelectedText() c.setPosition(self.prompt_frame.firstPosition()) - def render_current_prompt(self, lines=None): + def render_current_prompt(self, lines=None, restore_cursor=False): + row, col = self.cursor_pos cp = list(self.prompt()) if lines is None else lines self.clear_current_prompt() @@ -140,6 +159,9 @@ class Console(QTextEdit): if not end: self.cursor.insertBlock() + if row > -1 and restore_cursor: + self.cursor_pos = (row, col) + # }}} # Non-prompt Rendering {{{ @@ -259,7 +281,7 @@ class Console(QTextEdit): def text_typed(self, text): if self.prompt_frame is not None: self.cursor.insertText(text) - self.render_current_prompt() + self.render_current_prompt(restore_cursor=True) # }}} From fe6d962bee771a34dd4937b6f332e0d0d4114676 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 19:33:17 -0600 Subject: [PATCH 065/235] Use dialog instead of main window. Set console stylesheet based on pygments style. Don't block if there is a lot of output --- imgsrc/console.svg | 4339 ++++++++++++++++++++++ resources/images/console.png | Bin 0 -> 5110 bytes src/calibre/utils/pyconsole/__init__.py | 9 + src/calibre/utils/pyconsole/console.py | 117 +- src/calibre/utils/pyconsole/formatter.py | 14 +- src/calibre/utils/pyconsole/main.py | 44 +- 6 files changed, 4482 insertions(+), 41 deletions(-) create mode 100644 imgsrc/console.svg create mode 100644 resources/images/console.png diff --git a/imgsrc/console.svg b/imgsrc/console.svg new file mode 100644 index 0000000000..0d502bb1da --- /dev/null +++ b/imgsrc/console.svg @@ -0,0 +1,4339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/console.png b/resources/images/console.png new file mode 100644 index 0000000000000000000000000000000000000000..168f0ccb2a177087d2ee6157bb67166688c84c05 GIT binary patch literal 5110 zcmVxU{8 zPX+SQ2HuQqEW9l2vVZVDFa={E2%3ks4|OUPwOKoMg@^=5$wNZbR$+}383{v5y#|{) zyEePt#rEF4GjsYdf9{zx-#K$;?wz}{*YlIcXJ*ddIp6pFzVDowy#{hz*Dy5h%gW@) zE|}yz1W~vKcNDmDs%(zzfpIAVU~}iBB8Zk=aE}szB6s9UkbUsNx46TEqX;$#B`CS6 zC;TFSb^smj(e9S<*Z^Gl9NB#QUXx{+5vnGzzy!P6hNC>E?0nT zLR0_~Ko!6>09V`ta1U2e zwR!XArvXd=xCG!ToPaRE0NxXNOF(}4SG?z*d+xY&=@Q1r$H7BqB2^Qdq+UJ!)Z0HL z5M2Q^Gp|yqV0LyEj4`ZTyLJ<5mhZXnfD7RLx|dnt4r9rZC2bcjTtFisT3OV2Bl^+l zU#A@v6=x}La&i*w?d=^1FX02=wL%J>_IWf~U^3|R(}=M&>v_@wuMm|=g;J2vLq$gR zwr$4>R)B@K@J5#rpI`L5S;-Uc3wh*2QZ68H#1(!LWXZy1WwJ!?x_P#31Htz>A(Uhp zRD-8Zox;@AR8*B53y2jfR$#-14FL3(j*$w$V|scT!^6YLMwX)~ICSWcFL;*$l!(Ou z9=f`^uxj;6tXjPaot-zpFbsMP%K(O2>SVboW6oNHO1W};{aPOUGVscRtD{&?i(?9m zO*N*-v4!W1TB|n_j4{m5&*RdiOZf83FEKki8_JJDECuj<;;PjvvF>|!DJlgLUp&0P z#1d|2H9?B`if8dlsh&49CN7Pbr+}_Sj!h_)Vhm*%20A)AaP!SK0{~`cX9IDI4g-im zUUs;nIL#s+hKLBS-rFc)vfen=Kz*3Uk;!qBVrXm zB9Q`gb#+P0)Naz3Iu_>@3{JhM2{fC8X_sIhp&lvX2sV+bMUw^Zp`)V%0Mcau56Wej zglfYVlB!G;I6(nKlZoj+)R1CK6jLpbz(r6pNsR$iVQqE!8Alt~-9n^ztZtpenQ1Bpi9 z70#ox#SB`o$_Lh@c%6C+<^TCNf8tv}&)TUaxeAH)0c2&u;grncgp?6Wt3W+TzkdI! z!AVD?)=*+e8X6;^lu78HF&22|;+=a!)uD2#&E_*eprVlSmoX{6;r?I3Cekq}>kGFc zToW%`QP7P*Q(Ztqmw!@$iy1VV)V=)E(Jm(TDj7dxuq?|LvM1Dw&C>8wJjf;Ol25s%Z6=R zFii`VZGqVg{yTvMSoW#VPz8{E9~Uf4U+P$#m!}sS#GrpMb?fVljWNKoE!dVLaND-R zFN30CUJr?(=uUOwrlBbu;z|U9h(R&1pP@*6HSQ$l5Dsn$xC8!a{uor zm2F$FOv@L1=vx3~WEdhH06wObfP0>x@N@ zjq6&fgBcTi^J4%h)iOc)qBBl!`R56o3f!Uu7KllF!G~QM|7=;Ie;~dBXuS-g{%lIN z{OjG-i*K#|RH7dq zq1tKB?YCp+qdRf#+Nv8ydrP*-yN(y>v+ zG9-8ksqOHq#7$B!Sw+0Q;# zP%V>MoMl@uP1E0FmyTEYFp@rR2XA{vU|H574kLf;{~0cfSP#L!nUck7B8a zHEX_u!Ka3?ZR;agvEnAK1G&X9+eWoIk89Vip;D>9G)?J4DR%(_0t|GWh=l@K*^s-B zxF3ba`oj(0AS;B=-~DBviJ zA+`v!YQnNiSeEmfMvSmPrIt&mnhXmf>Md6PuZzUXK$XQ!OibV({_*e8b9)aSc;G>- z`Su#{-gpC-XD-uCD&{!(#~-b=`v=4i0_%$bD2hec;y(QF6rMe>AOH5#f5ptqj2|0# zD~pbf4*dC_ZNZQK?#HzjNWPZQzuHoTa8(bIU^HGM%||L5LE)Q$gf=pwonQR&7wGNV zg`fQMVa&|Tpja#hj?T_5b>Nkh{zDBBRTaS~9UEki{yn7rHZbnTAGU2d{@pZT6bdL6 zi^|_5X&C(n>eFM3ej_Q#&z{@?q___d+6Yq7zYEK>P&G~1mIW9FzW@Ed#QlGDKb9?9 z9?>b)hX(zNso;xrm`awX#X=cC)0TlMpK6&F=BrgO+Xe%$e*Jp<&0jx+TW`Hp+TQu| z=kc>+M~Rj_fhQjnX~+@vV#f>_M9Oai!-8@wzUseczvGUzc=(}*aeGgXbSBS?pTX$p zPx1cyzafPjNARTTC~3TPmVX|a`#RXoax8w{|3I>*XC)qf=wW>KyMH3}_2c7bFgiMl z_s4z{{M<@N)nikXl?9{jKauUL*dTjy_tBiUfu7(k$Kw4RI{=UG>chs3e~MzUK+e+_ zU!2F!jvd3V-}@COi0Gh_A4}}zUpO34Jg`CuGc0%t4O0MdBgk_1=sm$Z1)XHmrcFd6 z!1&p5jE;_C?8N&-JFc~$mkykz6{bqA_k~b=9HGopN)@?cJJO3Ze6wfBVF3!@c&5= zYa_^KfZ9Crm%)n$S)B8O*OEFhpk^Vu{l)12Q+XXMHXa>#$@4^;Qdu0pP%4$`pZG*$ z)2yE{r21Jncej?R1gQGKy{|A8K;h{hP z7z`;mAu`m28u+Up+43*m*cJ;5r1Hn1)DlpTLo`AGpW5O8hEG2EgoysRl(}LRQgJm9 z=uT^F#DgwEG{gn)i25QZGywOXkiZr7{Zbl!Tgo8Pn;J}&w*N^P;-~vjNTvXSrHZ~Z zNVT+-b?84-O~aUFF$p~;y;x>3`TvH06BxPsr@UFaSC7Rd`S>Hyyat;nhm?J}Cq{iP z0FX|ORN&w<)Pha&I|O7n5mB#|{C~q4fNnfOfSNB_MAYs7Rg~0%AAe9tMFEsQ67BvI zhvFOV|4G3|u@GIq73e>XvLL-eeUO zAf}7bs+VyzWgh^5bduC;Ao2I!l{S~xQc~blJ1S2U$CtDi5-$Tq($u5cAYxIi#Q)bW zBz<3JAAdAyAHYRIi&O0qhnkW4e^G!!KRPjqSch+Iamn3BbM^sZ`c@r_)AIik$uc23 z5=1acjsJQ;9SjgnwZU>UwEVw>{&fT{Do1E+g!U{}`Ujfi0_aIqfUr0ns!i|PfBJN> z(?8JEeEcS2i4f9VvAVtNm2jXKo>L{&=x1&O6%hf@1B&Y^t{xfLaHvH zhImw)g#NXPsDer+i$!SmX$AkE1hF=PLhk}nw7C3-ACsZE`v5#tv#zpKssAV1X2fl| zJ}6_qR`vf){2m}owRFHoqi+ANtap8U{Lu*1zYOG|VR1TCn|S%hm{KpI#?}ffurMw_ zI;m=llhc26y%^y{uqmoe3kcprbN2xj`r{AH*g%h|u0Q$*>V6xj0AX=;(|@48$Og&2 z{r8`wMdY69_W;UI!eUyS7X6E<5dD#CKtaJmts;02sm1{9?d^eUsldT!&;m{J@rT$i zl_#s$iUA*mVzC&jd@Kbhm&*V=0Yq6UjW~iQdr&ATj90vjY%-bC*Lu6%XH?UfrqAXQtOmj4$+dA>yWwj4w-8X9y9 zpi-$Ms+ULsKK=AlImIG;D&ER}__6VroSaNlPy0urcsFqF^Ybta11ned;D*l5U_rv- zbf`A};m2f{o14Sr^p@(0SCw0ES^;cz75G4<7XI4Gs?Cg%@7% zuLlMO@Z59H`PWZA`6Qlw_F4bBudfgL_wVR`mx6z!|vU?{p+1OcjD=% zpZ5FTv112@hK78_*tTsO1_uZI@{c_72nGfQ{OfJowqa;!$iLpPV+Te?Mgr~g{q5Sd zD=?nNAAdYB-Y1@TBJe!@{r!RGed?*F@ci@7``1H5LwNDU7yavzkrBM~(o6pJo;`c; z$}6w<*ZcPE!>g~p>R&(e%rkiHwb#%nBw7aY=x|?(S}Bf3ot8f&qsG+5vO| zSOMUh?y&+u=La8ra4<>G$DcPk0F<>Y3jl%a1#XSXi^As3o3{YC0N^5kuK>&g@Rta6 zxd4&=hlYlHx-$%er2hj44*1tP^uK4%9{<{-e^0O;{d?f)-!Kep-MSS60|WjOrh!pa_qSbm?40XP$eAL$`6<4`a;F_XH%;eH5Lm#^bfm_a|$g zzZToqoiECrBtfJLIC=8qL7=g;o#r`z&oGQk&~%!4QHbjT7;$JVy#@yd19T_Se}8|! zPydEt`1J3!-P_w+``(wd;Qfx|Gpe4l!Stjkgdrnx{njhs_2|wJ?NCz&5xpc z72QUy7Iem2&uSq7{gd+bTtFKnE?{hI>~Bk@QVB?ps?$0LuJ0{i+qSFs-h1y~Am{?B zh;RY6doTcOVq)S#WKRjutldQss)=ibJRX-XUp|AHEJ+l&Oi%EZdzb*M!-o&QV_BA& z_BL%)8*%%gSb#z+j1g{EV=K# z`)+&i!3Q^Xc6N4(6ziQA3WdPEq-FSfUU{*cPTL;%iL-4xa4kmDjIqFLRFQ5e`i*Ln z%BNDX->5bz7>2FlAPz109z>NTw z!x8>+xC#I#STwjgIkE-Dr6zzm0J8wT1aQesXWaW1R~{wQmI)Ss3Vr$Q2;V;1$4zBkXxNGOVDs`xjCGLpU$EM+r_`;2pW}vkzVgECg3`{L(%E zQJ@BQ6u5J$Y>w=KR|1a>0^9l`WI`30A;;nZlbq+skt0Wr96562$dMyQjvP61 -1 and restore_cursor: self.cursor_pos = (row, col) + self.ensureCursorVisible() + # }}} # Non-prompt Rendering {{{ @@ -185,16 +237,26 @@ class Console(QTextEdit): self.formatter.render(self.tb_lexer.get_tokens(tb), self.cursor) except: prints(tb, end='') + self.ensureCursorVisible() + QCoreApplication.processEvents() def show_output(self, raw): + def do_show(): + try: + self.buf.append(raw) + self.formatter.render_raw(raw, self.cursor) + except: + import traceback + prints(traceback.format_exc()) + prints(raw, end='') + if self.prompt_frame is not None: - # At a prompt, so redirect output - return prints(raw, end='') - try: - self.buf.append(raw) - self.formatter.render_raw(raw, self.cursor) - except: - prints(raw, end='') + with Prepender(self): + do_show() + else: + do_show() + self.ensureCursorVisible() + QCoreApplication.processEvents() # }}} @@ -203,16 +265,11 @@ class Console(QTextEdit): def keyPressEvent(self, ev): text = unicode(ev.text()) key = ev.key() - if key in (Qt.Key_Enter, Qt.Key_Return): - self.enter_pressed() - elif key == Qt.Key_Home: - self.home_pressed() - elif key == Qt.Key_End: - self.end_pressed() - elif key == Qt.Key_Left: - self.left_pressed() - elif key == Qt.Key_Right: - self.right_pressed() + action = self.key_dispatcher.get(key, None) + if callable(action): + action() + elif key in (Qt.Key_Escape,): + QTextEdit.keyPressEvent(self, ev) elif text: self.text_typed(text) else: @@ -230,6 +287,7 @@ class Console(QTextEdit): c.movePosition(c.Up) c.movePosition(c.EndOfLine) self.setTextCursor(c) + self.ensureCursorVisible() def right_pressed(self): lineno, pos = self.cursor_pos @@ -242,6 +300,7 @@ class Console(QTextEdit): elif lineno < len(cp)-1: c.movePosition(c.NextCharacter, n=1+self.prompt_len) self.setTextCursor(c) + self.ensureCursorVisible() def home_pressed(self): if self.prompt_frame is not None: @@ -249,12 +308,14 @@ class Console(QTextEdit): c.movePosition(c.StartOfLine) c.movePosition(c.NextCharacter, n=self.prompt_len) self.setTextCursor(c) + self.ensureCursorVisible() def end_pressed(self): if self.prompt_frame is not None: c = self.cursor c.movePosition(c.EndOfLine) self.setTextCursor(c) + self.ensureCursorVisible() def enter_pressed(self): if self.prompt_frame is None: @@ -267,7 +328,13 @@ class Console(QTextEdit): self.prompt_frame = None oldbuf = self.buf self.buf = [] - ret = self.interpreter.runsource('\n'.join(cp)) + self.running.emit() + try: + ret = self.interpreter.runsource('\n'.join(cp)) + except SystemExit: + ret = False + self.show_output('Raising SystemExit not allowed\n') + self.running_done.emit() if ret: # Incomplete command self.buf = oldbuf self.prompt_frame = old_pf @@ -275,7 +342,13 @@ class Console(QTextEdit): c.insertBlock() self.setTextCursor(c) else: # Command completed - old_pf.setFrameFormat(QTextFrameFormat()) + try: + old_pf.setFrameFormat(QTextFrameFormat()) + except RuntimeError: + # Happens if enough lines of output that the old + # frame was deleted + pass + self.render_current_prompt() def text_typed(self, text): diff --git a/src/calibre/utils/pyconsole/formatter.py b/src/calibre/utils/pyconsole/formatter.py index 7f99983ef6..9409007ec6 100644 --- a/src/calibre/utils/pyconsole/formatter.py +++ b/src/calibre/utils/pyconsole/formatter.py @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import QTextCharFormat, QFont, QBrush, QColor from pygments.formatter import Formatter as PF -from pygments.token import Token +from pygments.token import Token, Generic class Formatter(object): @@ -22,11 +22,16 @@ class Formatter(object): pf = PF(**options) self.styles = {} self.normal = self.base_fmt() + self.background_color = pf.style.background_color + self.color = 'black' + for ttype, ndef in pf.style: fmt = self.base_fmt() if ndef['color']: fmt.setForeground(QBrush(QColor('#%s'%ndef['color']))) fmt.setUnderlineColor(QColor('#%s'%ndef['color'])) + if ttype == Generic.Output: + self.color = '#%s'%ndef['color'] if ndef['bold']: fmt.setFontWeight(QFont.Bold) if ndef['italic']: @@ -40,6 +45,11 @@ class Formatter(object): self.styles[ttype] = fmt + self.stylesheet = ''' + QTextEdit { color: %s; background-color: %s } + '''%(self.color, self.background_color) + + def base_fmt(self): fmt = QTextCharFormat() fmt.setFontFamily('monospace') @@ -74,7 +84,7 @@ class Formatter(object): def render_prompt(self, is_continuation, cursor): pr = self.continuation if is_continuation else self.prompt - fmt = self.styles[Token.Generic.Subheading] + fmt = self.styles[Generic.Prompt] cursor.insertText(pr, fmt) diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index af99ec66bb..f098ce2ee2 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -6,19 +6,31 @@ __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' __version__ = '0.1.0' -from PyQt4.Qt import QMainWindow, QToolBar, QStatusBar, QLabel, QFont, Qt, \ - QApplication +from functools import partial + +from PyQt4.Qt import QDialog, QToolBar, QStatusBar, QLabel, QFont, Qt, \ + QApplication, QIcon, QVBoxLayout from calibre.constants import __appname__, __version__ from calibre.utils.pyconsole.console import Console -class MainWindow(QMainWindow): +class MainWindow(QDialog): - def __init__(self, default_status_msg): + def __init__(self, + default_status_msg=_('Welcome to') + ' ' + __appname__+' console', + parent=None): - QMainWindow.__init__(self) + QDialog.__init__(self, parent) + self.l = QVBoxLayout() + self.setLayout(self.l) - self.resize(600, 700) + self.resize(800, 600) + + # Setup tool bar {{{ + self.tool_bar = QToolBar(self) + self.tool_bar.setToolButtonStyle(Qt.ToolButtonTextOnly) + self.l.addWidget(self.tool_bar) + # }}} # Setup status bar {{{ self.status_bar = QStatusBar(self) @@ -28,25 +40,23 @@ class MainWindow(QMainWindow): self.status_bar._font.setBold(True) self.status_bar.defmsg.setFont(self.status_bar._font) self.status_bar.addWidget(self.status_bar.defmsg) - self.setStatusBar(self.status_bar) # }}} - # Setup tool bar {{{ - self.tool_bar = QToolBar(self) - self.addToolBar(Qt.BottomToolBarArea, self.tool_bar) - self.tool_bar.setToolButtonStyle(Qt.ToolButtonTextOnly) - # }}} - - self.editor = Console(parent=self) - self.setCentralWidget(self.editor) - + self.console = Console(parent=self) + self.console.running.connect(partial(self.status_bar.showMessage, + _('Code is running'))) + self.console.running_done.connect(self.status_bar.clearMessage) + self.l.addWidget(self.console) + self.l.addWidget(self.status_bar) + self.setWindowTitle(__appname__ + ' console') + self.setWindowIcon(QIcon(I('console.png'))) def main(): QApplication.setApplicationName(__appname__+' console') QApplication.setOrganizationName('Kovid Goyal') app = QApplication([]) - m = MainWindow(_('Welcome to') + ' ' + __appname__+' console') + m = MainWindow() m.show() app.exec_() From 3fff4da652dd242fbdeb52c8d5676043c02df7c4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 20 Sep 2010 21:32:29 -0600 Subject: [PATCH 066/235] Infrastructure changes to launch pyconsole interpreter process --- src/calibre/utils/ipc/launch.py | 21 ++++++++++++--------- src/calibre/utils/ipc/worker.py | 4 ++++ src/calibre/utils/pyconsole/console.py | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/calibre/utils/ipc/launch.py b/src/calibre/utils/ipc/launch.py index 0de81ed644..aa93469119 100644 --- a/src/calibre/utils/ipc/launch.py +++ b/src/calibre/utils/ipc/launch.py @@ -22,13 +22,15 @@ class Worker(object): have the environment variable :envvar:`CALIBRE_WORKER` set. Useful attributes: ``is_alive``, ``returncode`` - usefule methods: ``kill`` + Useful methods: ``kill`` To launch child simply call the Worker object. By default, the child's output is redirected to an on disk file, the path to which is returned by the call. ''' + exe_name = 'calibre-parallel' + @property def osx_interpreter(self): exe = os.path.basename(sys.executable) @@ -41,32 +43,33 @@ class Worker(object): @property def executable(self): + e = self.exe_name if iswindows: return os.path.join(os.path.dirname(sys.executable), - 'calibre-parallel.exe' if isfrozen else \ - 'Scripts\\calibre-parallel.exe') + e+'.exe' if isfrozen else \ + 'Scripts\\%s.exe'%e) if isnewosx: - return os.path.join(sys.console_binaries_path, 'calibre-parallel') + return os.path.join(sys.console_binaries_path, e) if isosx: - if not isfrozen: return 'calibre-parallel' + if not isfrozen: return e contents = os.path.join(self.osx_contents_dir, 'console.app', 'Contents') return os.path.join(contents, 'MacOS', self.osx_interpreter) if isfrozen: - return os.path.join(getattr(sys, 'frozen_path'), 'calibre-parallel') + return os.path.join(getattr(sys, 'frozen_path'), e) - c = os.path.join(sys.executables_location, 'calibre-parallel') + c = os.path.join(sys.executables_location, e) if os.access(c, os.X_OK): return c - return 'calibre-parallel' + return e @property def gui_executable(self): if isnewosx: - return os.path.join(sys.binaries_path, 'calibre-parallel') + return os.path.join(sys.binaries_path, self.exe_name) if isfrozen and isosx: return os.path.join(self.osx_contents_dir, diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index 73233840fe..b7510426aa 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -80,8 +80,12 @@ def main(): if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to # launch the last run process from the bundle + # so launch the gui as usual from calibre.gui2.main import main as gui_main return gui_main(['calibre']) + if 'CALIBRE_LAUNCH_INTERPRETER' in os.environ: + from calibre.utils.pyconsole.interpreter import main + return main() address = cPickle.loads(unhexlify(os.environ['CALIBRE_WORKER_ADDRESS'])) key = unhexlify(os.environ['CALIBRE_WORKER_KEY']) resultf = unhexlify(os.environ['CALIBRE_WORKER_RESULT']) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 251e8424a0..f741562f03 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -47,6 +47,7 @@ class Prepender(object): # {{{ self.console.cursor_pos = self.opos # }}} + class Console(QTextEdit): running = pyqtSignal() From ff73865d9e75d5d4e44eb584961209654d7239e9 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 21 Sep 2010 14:13:03 +0100 Subject: [PATCH 067/235] Prevent cross-thread lock errors by having the cover cache get the image on the GUI thread. --- src/calibre/gui2/__init__.py | 30 +++++++++++++++++++++++++++++- src/calibre/gui2/library/models.py | 4 ++-- src/calibre/library/caches.py | 7 +++++-- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index e58dce5559..ba32c09e06 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1,7 +1,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' """ The GUI """ -import os, sys +import os, sys, Queue from threading import RLock from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \ @@ -296,6 +296,34 @@ class Dispatcher(QObject): def dispatch(self, args, kwargs): self.func(*args, **kwargs) +class FunctionDispatcher(QObject): + ''' + Convenience class to use Qt signals with arbitrary python functions. + By default, ensures that a function call always happens in the + thread this Dispatcher was created in. + ''' + dispatch_signal = pyqtSignal(object, object, object) + + def __init__(self, func, queued=True, parent=None): + QObject.__init__(self, parent) + self.func = func + typ = Qt.QueuedConnection + if not queued: + typ = Qt.AutoConnection if queued is None else Qt.DirectConnection + self.dispatch_signal.connect(self.dispatch, type=typ) + + def __call__(self, *args, **kwargs): + q = Queue.Queue() + self.dispatch_signal.emit(q, args, kwargs) + return q.get() + + def dispatch(self, q, args, kwargs): + try: + res = self.func(*args, **kwargs) + except: + res = None + q.put(res) + class GetMetadata(QObject): ''' Convenience class to ensure that metadata readers are used only in the diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 6941869e44..4b1e974b12 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -12,7 +12,7 @@ from operator import attrgetter from PyQt4.Qt import QAbstractTableModel, Qt, pyqtSignal, QIcon, QImage, \ QModelIndex, QVariant, QDate -from calibre.gui2 import NONE, config, UNDEFINED_QDATE +from calibre.gui2 import NONE, config, UNDEFINED_QDATE, FunctionDispatcher from calibre.utils.pyparsing import ParseException from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors from calibre.ptempfile import PersistentTemporaryFile @@ -151,7 +151,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.database_changed.emit(db) if self.cover_cache is not None: self.cover_cache.stop() - self.cover_cache = CoverCache(db) + self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() def refresh_cover(event, ids): if event == 'cover' and self.cover_cache is not None: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 5f7fbdccc9..573c1f5797 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -23,10 +23,11 @@ from calibre import fit_image class CoverCache(Thread): - def __init__(self, db): + def __init__(self, db, cover_func): Thread.__init__(self) self.daemon = True self.db = db + self.cover_func = cover_func self.load_queue = Queue() self.keep_running = True self.cache = {} @@ -37,7 +38,9 @@ class CoverCache(Thread): self.keep_running = False def _image_for_id(self, id_): - img = self.db.cover(id_, index_is_id=True, as_image=True) + import time + time.sleep(0.050) # Limit 20/second to not overwhelm the GUI + img = self.cover_func(id_, index_is_id=True, as_image=True) if img is None: img = QImage() if not img.isNull(): From be2210f928d0023ae1f752aeea3fb51f84132e8d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 21 Sep 2010 15:26:02 +0100 Subject: [PATCH 068/235] Add 'start series renumbering from N' to bulk edit. --- src/calibre/gui2/dialogs/metadata_bulk.py | 25 +++++++- src/calibre/gui2/dialogs/metadata_bulk.ui | 69 +++++++++++++++++++---- 2 files changed, 79 insertions(+), 15 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 7122fe14fa..8a692d94d5 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -31,7 +31,8 @@ class Worker(Thread): def doit(self): remove, add, au, aus, do_aus, rating, pub, do_series, \ do_autonumber, do_remove_format, remove_format, do_swap_ta, \ - do_remove_conv, do_auto_author, series = self.args + do_remove_conv, do_auto_author, series, do_series_restart, \ + series_start_value = self.args # first loop: do author and title. These will commit at the end of each # operation, because each operation modifies the file system. We want to @@ -69,7 +70,11 @@ class Worker(Thread): self.db.set_publisher(id, pub, notify=False, commit=False) if do_series: - next = self.db.get_next_series_num_for(series) + if do_series_restart: + next = series_start_value + series_start_value += 1 + else: + next = self.db.get_next_series_num_for(series) self.db.set_series(id, series, notify=False, commit=False) num = next if do_autonumber and series else 1.0 self.db.set_series_index(id, num, notify=False, commit=False) @@ -163,6 +168,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.series.currentIndexChanged[int].connect(self.series_changed) self.series.editTextChanged.connect(self.series_changed) self.tag_editor_button.clicked.connect(self.tag_editor) + self.autonumber_series.stateChanged[int].connect(self.auto_number_changed) if len(db.custom_column_label_map) == 0: self.central_widget.removeTab(1) @@ -538,6 +544,16 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.tags.update_tags_cache(self.db.all_tags()) self.remove_tags.update_tags_cache(self.db.all_tags()) + def auto_number_changed(self, state): + if state: + self.series_numbering_restarts.setEnabled(True) + self.series_start_number.setEnabled(True) + else: + self.series_numbering_restarts.setEnabled(False) + self.series_numbering_restarts.setChecked(False) + self.series_start_number.setEnabled(False) + self.series_start_number.setValue(1) + def accept(self): if len(self.ids) < 1: return QDialog.accept(self) @@ -566,6 +582,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): do_series = self.write_series series = unicode(self.series.currentText()).strip() do_autonumber = self.autonumber_series.isChecked() + do_series_restart = self.series_numbering_restarts.isChecked() + series_start_value = self.series_start_number.value() do_remove_format = self.remove_format.currentIndex() > -1 remove_format = unicode(self.remove_format.currentText()) do_swap_ta = self.swap_title_and_author.isChecked() @@ -574,7 +592,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): args = (remove, add, au, aus, do_aus, rating, pub, do_series, do_autonumber, do_remove_format, remove_format, do_swap_ta, - do_remove_conv, do_auto_author, series) + do_remove_conv, do_auto_author, series, do_series_restart, + series_start_value) bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') %len(self.ids), parent=self) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index f28f3fb57c..10e22c5df9 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -270,18 +270,63 @@ - - - - Selected books will be automatically numbered, -in the order you selected them. -So if you selected Book A and then Book B, + + + + + + If not checked, the series number for the books will be set to 1. +If checked, selected books will be automatically numbered, in the order +you selected them. So if you selected Book A and then Book B, Book A will have series number 1 and Book B series number 2. - - - Automatically number books in this series - - + + + Automatically number books in this series + + + + + + + false + + + Series will normally be renumbered from the highest number in the database +for that series. Checking this box will tell calibre to start numbering +from the value in the box + + + Force numbers to start with + + + + + + + false + + + 1 + + + 1 + + + + + + + Qt::Horizontal + + + + 20 + 10 + + + + + @@ -599,7 +644,7 @@ nothing should be put between the original text and the inserted text 20 - 40 + 0 From 8a3aa64776aaf11c9909a6518c4f0f90f55a2946 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 21 Sep 2010 15:53:54 +0100 Subject: [PATCH 069/235] Changed sort to use field_metadata.search_term_to_field_key. In the process, refactored field_metadata and LibraryDatabase2 to use the same method names for the same function (in more cases). --- src/calibre/library/caches.py | 11 ++++------- src/calibre/library/database2.py | 4 ++-- src/calibre/library/field_metadata.py | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 573c1f5797..d310a0e6fe 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -334,7 +334,7 @@ class ResultCache(SearchQueryParser): if query and query.strip(): # get metadata key associated with the search term. Eliminates # dealing with plurals and other aliases - location = self.field_metadata.search_term_to_key(location.lower().strip()) + location = self.field_metadata.search_term_to_field_key(location.lower().strip()) if isinstance(location, list): if allow_recursion: for loc in location: @@ -610,12 +610,9 @@ class ResultCache(SearchQueryParser): # Sorting functions {{{ def sanitize_sort_field_name(self, field): - field = field.lower().strip() - if field not in self.field_metadata.iterkeys(): - if field in ('author', 'tag', 'comment'): - field += 's' - if field == 'date': field = 'timestamp' - elif field == 'title': field = 'sort' + field = self.field_metadata.search_term_to_field_key(field.lower().strip()) + # translate some fields to their hidden equivalent + if field == 'title': field = 'sort' elif field == 'authors': field = 'author_sort' return field diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index c1ada94a84..77e3afc8a3 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -552,10 +552,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): return self.field_metadata.sortable_field_keys() def searchable_fields(self): - return self.field_metadata.searchable_field_keys() + return self.field_metadata.searchable_fields() def search_term_to_field_key(self, term): - return self.field_metadata.search_term_to_key(term) + return self.field_metadata.search_term_to_field_key(term) def metadata_for_field(self, key): return self.field_metadata[key] diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index a8031e5172..bac423f46d 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -501,12 +501,12 @@ class FieldMetadata(dict): raise ValueError('Attempt to add duplicate search term "%s"'%t) self._search_term_map[t] = key - def search_term_to_key(self, term): + def search_term_to_field_key(self, term): if term in self._search_term_map: return self._search_term_map[term] return term - def searchable_field_keys(self): + def searchable_fields(self): return [k for k in self._tb_cats.keys() if self._tb_cats[k]['kind']=='field' and len(self._tb_cats[k]['search_terms']) > 0] From ba6f2f0c5e6cd9943827cda2ccc4a59d32fdbb8b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 21 Sep 2010 18:50:21 +0100 Subject: [PATCH 070/235] Take out commit= parameter on set_authors and set_title. Change other code where necessary --- src/calibre/gui2/dialogs/metadata_bulk.py | 5 ++++- src/calibre/library/database2.py | 19 ++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 8a692d94d5..18d00191cc 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -484,7 +484,10 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): setter = self.db.set_comment else: setter = getattr(self.db, 'set_'+dest) - setter(id, val, notify=False, commit=False) + if dest in ['title', 'authors']: + setter(id, val, notify=False) + else: + setter(id, val, notify=False, commit=False) self.db.commit() dynamic['s_r_search_mode'] = self.search_mode.currentIndex() diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 77e3afc8a3..1fdacfc09f 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -407,7 +407,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): path = path.lower() return path - def set_path(self, index, index_is_id=False, commit=True): + def set_path(self, index, index_is_id=False): ''' Set the path to the directory containing this books files based on its current title and author. If there was a previous directory, its contents @@ -447,8 +447,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.add_format(id, format, stream, index_is_id=True, path=tpath, notify=False) self.conn.execute('UPDATE books SET path=? WHERE id=?', (path, id)) - if commit: - self.conn.commit() + self.conn.commit() self.data.set(id, self.FIELD_MAP['path'], path, row_is_id=True) # Delete not needed directories if current_path and os.path.exists(spath): @@ -1212,7 +1211,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): result.append(r) return ' & '.join(result).replace('|', ',') - def set_authors(self, id, authors, notify=True, commit=True): + def set_authors(self, id, authors, notify=True): ''' `authors`: A list of authors. ''' @@ -1240,17 +1239,16 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): ss = self.author_sort_from_book(id, index_is_id=True) self.conn.execute('UPDATE books SET author_sort=? WHERE id=?', (ss, id)) - if commit: - self.conn.commit() + self.conn.commit() self.data.set(id, self.FIELD_MAP['authors'], ','.join([a.replace(',', '|') for a in authors]), row_is_id=True) self.data.set(id, self.FIELD_MAP['author_sort'], ss, row_is_id=True) - self.set_path(id, index_is_id=True, commit=commit) + self.set_path(id, index_is_id=True) if notify: self.notify('metadata', [id]) - def set_title(self, id, title, notify=True, commit=True): + def set_title(self, id, title, notify=True): if not title: return if not isinstance(title, unicode): @@ -1261,9 +1259,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.data.set(id, self.FIELD_MAP['sort'], title_sort(title), row_is_id=True) else: self.data.set(id, self.FIELD_MAP['sort'], title, row_is_id=True) - self.set_path(id, index_is_id=True, commit=commit) - if commit: - self.conn.commit() + self.set_path(id, index_is_id=True) + self.conn.commit() if notify: self.notify('metadata', [id]) From a62ad5f70cbae026d64d183117a3ec02de59444c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 21 Sep 2010 20:20:34 +0100 Subject: [PATCH 071/235] Use one queue object in FunctionDispatch. Theory: the producer (Qt GUI cover function) exists only once per instance of FunctionDispatcher. This follows from the fact that the dispatcher instance is created on the recipient thread. The consumer (the cover cache) could in theory be multiple threads (but it isn't). Because the items produced by the producer are not equivalent, we need to ensure that the order of items put in the queue by the producer is equal to the order of the requests. To guarantee this order, regardless of the number of consumer threads, we ensure that only one request to the producer can be outstanding. --- src/calibre/gui2/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 66e199b8a0..8cfcc17eba 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -1,7 +1,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' """ The GUI """ -import os, sys, Queue +import os, sys, Queue, threading from threading import RLock from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \ @@ -311,11 +311,14 @@ class FunctionDispatcher(QObject): if not queued: typ = Qt.AutoConnection if queued is None else Qt.DirectConnection self.dispatch_signal.connect(self.dispatch, type=typ) + self.q = Queue.Queue() + self.lock = threading.Lock() def __call__(self, *args, **kwargs): - q = Queue.Queue() - self.dispatch_signal.emit(q, args, kwargs) - return q.get() + with self.lock: + self.dispatch_signal.emit(self.q, args, kwargs) + res = self.q.get() + return res def dispatch(self, q, args, kwargs): try: From 06173bccebb0d8b3df497d0d0df030c1710aa80b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 13:45:34 -0600 Subject: [PATCH 072/235] Second beta --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 334406e01b..91c114359c 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.7.900' +__version__ = '0.7.901' __author__ = "Kovid Goyal " import re From 63f02aa91beaa330a45d8c572cb6e092832b6cb0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 15:19:14 -0600 Subject: [PATCH 073/235] Fix regression in get_metadata for books with no formats --- src/calibre/library/database2.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 01d46083b2..3e7b932808 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -590,7 +590,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.pubdate = self.pubdate(idx, index_is_id=index_is_id) mi.uuid = self.uuid(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) - mi.formats = self.formats(idx, index_is_id=index_is_id).split(',') + mi.formats = self.formats(idx, index_is_id=index_is_id) + if hasattr(mi.formats, 'split'): + mi.formats = mi.formats.split(',') + else: + mi.formats = None tags = self.tags(idx, index_is_id=index_is_id) if tags: mi.tags = [i.strip() for i in tags.split(',')] From d225fd9ff5c08083d79238f489cd72abbef8b61d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 15:22:00 -0600 Subject: [PATCH 074/235] Allow --reinitialize-db to use an SQL dump from elsewhere --- src/calibre/debug.py | 47 ++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/calibre/debug.py b/src/calibre/debug.py index 8a2097ddd1..8cc125b118 100644 --- a/src/calibre/debug.py +++ b/src/calibre/debug.py @@ -36,13 +36,17 @@ Run an embedded python interpreter. 'plugin code.') parser.add_option('--reinitialize-db', default=None, help='Re-initialize the sqlite calibre database at the ' - 'specified path. Useful to recover from db corruption.') + 'specified path. Useful to recover from db corruption.' + ' You can also specify the path to an SQL dump which ' + 'will be used instead of trying to dump the database.' + ' This can be useful when dumping fails, but dumping ' + 'with sqlite3 works.') parser.add_option('-p', '--py-console', help='Run python console', default=False, action='store_true') return parser -def reinit_db(dbpath, callback=None): +def reinit_db(dbpath, callback=None, sql_dump=None): if not os.path.exists(dbpath): raise ValueError(dbpath + ' does not exist') from calibre.library.sqlite import connect @@ -52,26 +56,32 @@ def reinit_db(dbpath, callback=None): uv = conn.get('PRAGMA user_version;', all=False) conn.execute('PRAGMA writable_schema=ON') conn.commit() - sql_lines = conn.dump() + if sql_dump is None: + sql_lines = conn.dump() + else: + sql_lines = open(sql_dump, 'rb').read() conn.close() dest = dbpath + '.tmp' try: with closing(connect(dest, False)) as nconn: nconn.execute('create temporary table temp_sequence(id INTEGER PRIMARY KEY AUTOINCREMENT)') nconn.commit() - if callable(callback): - callback(len(sql_lines), True) - for i, line in enumerate(sql_lines): - try: - nconn.execute(line) - except: - import traceback - prints('SQL line %r failed with error:'%line) - prints(traceback.format_exc()) - continue - finally: - if callable(callback): - callback(i, False) + if sql_dump is None: + if callable(callback): + callback(len(sql_lines), True) + for i, line in enumerate(sql_lines): + try: + nconn.execute(line) + except: + import traceback + prints('SQL line %r failed with error:'%line) + prints(traceback.format_exc()) + continue + finally: + if callable(callback): + callback(i, False) + else: + nconn.executescript(sql_lines) nconn.execute('pragma user_version=%d'%int(uv)) nconn.commit() os.remove(dbpath) @@ -170,7 +180,10 @@ def main(args=sys.argv): prints('CALIBRE_EXTENSIONS_PATH='+sys.extensions_location) prints('CALIBRE_PYTHON_PATH='+os.pathsep.join(sys.path)) elif opts.reinitialize_db is not None: - reinit_db(opts.reinitialize_db) + sql_dump = None + if len(args) > 1 and os.access(args[-1], os.R_OK): + sql_dump = args[-1] + reinit_db(opts.reinitialize_db, sql_dump=sql_dump) else: from calibre import ipython ipython() From 7f472f742ece9ada0736690c440dc2e9da30cc74 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 21:05:23 -0600 Subject: [PATCH 075/235] Styling cleanups --- src/calibre/utils/pyconsole/formatter.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/calibre/utils/pyconsole/formatter.py b/src/calibre/utils/pyconsole/formatter.py index 9409007ec6..6e7d982a82 100644 --- a/src/calibre/utils/pyconsole/formatter.py +++ b/src/calibre/utils/pyconsole/formatter.py @@ -8,18 +8,20 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import QTextCharFormat, QFont, QBrush, QColor from pygments.formatter import Formatter as PF -from pygments.token import Token, Generic +from pygments.token import Token, Generic, string_to_tokentype class Formatter(object): - def __init__(self, prompt, continuation, **options): + def __init__(self, prompt, continuation, style='default'): if len(prompt) != len(continuation): raise ValueError('%r does not have the same length as %r' % (prompt, continuation)) self.prompt, self.continuation = prompt, continuation + self.set_style(style) - pf = PF(**options) + def set_style(self, style): + pf = PF(style=style) self.styles = {} self.normal = self.base_fmt() self.background_color = pf.style.background_color @@ -27,6 +29,7 @@ class Formatter(object): for ttype, ndef in pf.style: fmt = self.base_fmt() + fmt.setProperty(fmt.UserProperty, str(ttype)) if ndef['color']: fmt.setForeground(QBrush(QColor('#%s'%ndef['color']))) fmt.setUnderlineColor(QColor('#%s'%ndef['color'])) @@ -49,6 +52,14 @@ class Formatter(object): QTextEdit { color: %s; background-color: %s } '''%(self.color, self.background_color) + def get_fmt(self, token): + if type(token) != type(Token.Generic): + token = string_to_tokentype(token) + fmt = self.styles.get(token, None) + if fmt is None: + fmt = self.base_fmt() + fmt.setProperty(fmt.UserProperty, str(token)) + return fmt def base_fmt(self): fmt = QTextCharFormat() @@ -59,7 +70,7 @@ class Formatter(object): cursor.insertText(raw, self.normal) def render_syntax_error(self, tb, cursor): - fmt = self.styles[Token.Error] + fmt = self.get_fmt(Token.Error) cursor.insertText(tb, fmt) def render(self, tokens, cursor): @@ -84,7 +95,9 @@ class Formatter(object): def render_prompt(self, is_continuation, cursor): pr = self.continuation if is_continuation else self.prompt - fmt = self.styles[Generic.Prompt] + fmt = self.get_fmt(Generic.Prompt) + if fmt is None: + fmt = self.base_fmt() cursor.insertText(pr, fmt) From 35dba964c6241d5600d6aeba4bfcf27d104ee8f9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 21:46:56 -0600 Subject: [PATCH 076/235] Theming support for console via right click menu --- src/calibre/utils/pyconsole/__init__.py | 14 +++++--- src/calibre/utils/pyconsole/console.py | 44 +++++++++++++++++++++--- src/calibre/utils/pyconsole/formatter.py | 4 --- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index 0dfa9398e1..06a7011132 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -8,14 +8,18 @@ __docformat__ = 'restructuredtext en' import sys from calibre import prints as prints_ -from calibre.utils.config import Config, StringConfig +from calibre.utils.config import Config, ConfigProxy -def console_config(defaults=None): - desc=_('Settings to control the calibre content server') - c = Config('console', desc) if defaults is None else StringConfig(defaults, desc) +def console_config(): + desc='Settings to control the calibre console' + c = Config('console', desc) - c.add_opt('--theme', default='default', help='The color theme') + c.add_opt('theme', default='default', help='The color theme') + + return c + +prefs = ConfigProxy(console_config()) def prints(*args, **kwargs): diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index f741562f03..b0ecce0cb3 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -6,16 +6,18 @@ __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' import sys, textwrap, traceback, StringIO +from functools import partial from PyQt4.Qt import QTextEdit, Qt, QTextFrameFormat, pyqtSignal, \ - QCoreApplication + QCoreApplication, QColor, QPalette, QMenu, QActionGroup from pygments.lexers import PythonLexer, PythonTracebackLexer +from pygments.styles import get_all_styles from calibre.constants import __appname__, __version__ from calibre.utils.pyconsole.formatter import Formatter from calibre.utils.pyconsole.repl import Interpreter, DummyFile -from calibre.utils.pyconsole import prints +from calibre.utils.pyconsole import prints, prefs from calibre.gui2 import error_dialog class EditBlock(object): # {{{ @@ -47,6 +49,28 @@ class Prepender(object): # {{{ self.console.cursor_pos = self.opos # }}} +class ThemeMenu(QMenu): + + def __init__(self, parent): + QMenu.__init__(self, _('Choose theme (needs restart)')) + parent.addMenu(self) + self.group = QActionGroup(self) + current = prefs['theme'] + alls = list(sorted(get_all_styles())) + if current not in alls: + current = prefs['theme'] = 'default' + self.actions = [] + for style in alls: + ac = self.group.addAction(style) + if current == style: + ac.setChecked(True) + self.actions.append(ac) + ac.triggered.connect(partial(self.set_theme, style)) + self.addAction(ac) + + def set_theme(self, style, *args): + prefs['theme'] = style + class Console(QTextEdit): @@ -99,8 +123,16 @@ class Console(QTextEdit): self.doc.setMaximumBlockCount(10000) self.lexer = PythonLexer(ensurenl=False) self.tb_lexer = PythonTracebackLexer() - self.formatter = Formatter(prompt, continuation, style='default') - self.setStyleSheet(self.formatter.stylesheet) + + self.context_menu = cm = QMenu(self) # {{{ + cm.theme = ThemeMenu(cm) + # }}} + + self.formatter = Formatter(prompt, continuation, style=prefs['theme']) + p = QPalette() + p.setColor(p.Base, QColor(self.formatter.background_color)) + p.setColor(p.Text, QColor(self.formatter.color)) + self.setPalette(p) self.key_dispatcher = { # {{{ Qt.Key_Enter : self.enter_pressed, @@ -127,6 +159,10 @@ class Console(QTextEdit): sys.excepthook = self.unhandled_exception + def contextMenuEvent(self, event): + self.context_menu.popup(event.globalPos()) + event.accept() + # Prompt management {{{ diff --git a/src/calibre/utils/pyconsole/formatter.py b/src/calibre/utils/pyconsole/formatter.py index 6e7d982a82..17360fecb3 100644 --- a/src/calibre/utils/pyconsole/formatter.py +++ b/src/calibre/utils/pyconsole/formatter.py @@ -48,10 +48,6 @@ class Formatter(object): self.styles[ttype] = fmt - self.stylesheet = ''' - QTextEdit { color: %s; background-color: %s } - '''%(self.color, self.background_color) - def get_fmt(self, token): if type(token) != type(Token.Generic): token = string_to_tokentype(token) From e7adf45c01b21a584158728de903837d79f82298 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 22:21:36 -0600 Subject: [PATCH 077/235] Restart and context menu added to console --- src/calibre/utils/pyconsole/__init__.py | 2 +- src/calibre/utils/pyconsole/console.py | 5 +++-- src/calibre/utils/pyconsole/main.py | 23 ++++++++++++++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index 06a7011132..32eb926143 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -15,7 +15,7 @@ def console_config(): desc='Settings to control the calibre console' c = Config('console', desc) - c.add_opt('theme', default='default', help='The color theme') + c.add_opt('theme', default='native', help='The color theme') return c diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index b0ecce0cb3..164cf4e2ca 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -49,7 +49,7 @@ class Prepender(object): # {{{ self.console.cursor_pos = self.opos # }}} -class ThemeMenu(QMenu): +class ThemeMenu(QMenu): # {{{ def __init__(self, parent): QMenu.__init__(self, _('Choose theme (needs restart)')) @@ -62,6 +62,7 @@ class ThemeMenu(QMenu): self.actions = [] for style in alls: ac = self.group.addAction(style) + ac.setCheckable(True) if current == style: ac.setChecked(True) self.actions.append(ac) @@ -71,6 +72,7 @@ class ThemeMenu(QMenu): def set_theme(self, style, *args): prefs['theme'] = style +# }}} class Console(QTextEdit): @@ -163,7 +165,6 @@ class Console(QTextEdit): self.context_menu.popup(event.globalPos()) event.accept() - # Prompt management {{{ @dynamic_property diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index f098ce2ee2..a5a4b42266 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -9,7 +9,7 @@ __version__ = '0.1.0' from functools import partial from PyQt4.Qt import QDialog, QToolBar, QStatusBar, QLabel, QFont, Qt, \ - QApplication, QIcon, QVBoxLayout + QApplication, QIcon, QVBoxLayout, QAction from calibre.constants import __appname__, __version__ from calibre.utils.pyconsole.console import Console @@ -19,8 +19,9 @@ class MainWindow(QDialog): def __init__(self, default_status_msg=_('Welcome to') + ' ' + __appname__+' console', parent=None): - QDialog.__init__(self, parent) + + self.restart_requested = False self.l = QVBoxLayout() self.setLayout(self.l) @@ -51,14 +52,26 @@ class MainWindow(QDialog): self.setWindowTitle(__appname__ + ' console') self.setWindowIcon(QIcon(I('console.png'))) + self.restart_action = QAction(_('Restart'), self) + self.restart_action.setShortcut(_('Ctrl+R')) + self.addAction(self.restart_action) + self.restart_action.triggered.connect(self.restart) + self.console.context_menu.addAction(self.restart_action) + + def restart(self): + self.restart_requested = True + self.reject() def main(): QApplication.setApplicationName(__appname__+' console') QApplication.setOrganizationName('Kovid Goyal') app = QApplication([]) - m = MainWindow() - m.show() - app.exec_() + app + while True: + m = MainWindow() + m.exec_() + if not m.restart_requested: + break if __name__ == '__main__': From a41f481ee7d3a72b727c1f6b2d98ae10443cb0d2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 22:28:49 -0600 Subject: [PATCH 078/235] Backspace and delete now work in console --- src/calibre/utils/pyconsole/console.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 164cf4e2ca..aa0ff84d77 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -143,6 +143,8 @@ class Console(QTextEdit): Qt.Key_End : self.end_pressed, Qt.Key_Left : self.left_pressed, Qt.Key_Right : self.right_pressed, + Qt.Key_Backspace : self.backspace_pressed, + Qt.Key_Delete : self.delete_pressed, } # }}} motd = textwrap.dedent('''\ @@ -327,6 +329,22 @@ class Console(QTextEdit): self.setTextCursor(c) self.ensureCursorVisible() + def backspace_pressed(self): + lineno, pos = self.cursor_pos + if lineno < 0: return + if pos > self.prompt_len: + self.cursor.deletePreviousChar() + elif lineno > 0: + c = self.cursor + c.movePosition(c.Up) + c.movePosition(c.EndOfLine) + self.setTextCursor(c) + self.ensureCursorVisible() + + def delete_pressed(self): + self.cursor.deleteChar() + self.ensureCursorVisible() + def right_pressed(self): lineno, pos = self.cursor_pos if lineno < 0: return From fdd839af7cafa964b26cc9481cc55a7d5b65b16a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Sep 2010 22:46:54 -0600 Subject: [PATCH 079/235] Ctrl+Home and Ctrl+End now work --- src/calibre/utils/pyconsole/console.py | 23 ++++++++++++++++------- src/calibre/utils/pyconsole/main.py | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index aa0ff84d77..81169140cd 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -9,7 +9,7 @@ import sys, textwrap, traceback, StringIO from functools import partial from PyQt4.Qt import QTextEdit, Qt, QTextFrameFormat, pyqtSignal, \ - QCoreApplication, QColor, QPalette, QMenu, QActionGroup + QApplication, QColor, QPalette, QMenu, QActionGroup from pygments.lexers import PythonLexer, PythonTracebackLexer from pygments.styles import get_all_styles @@ -278,7 +278,7 @@ class Console(QTextEdit): except: prints(tb, end='') self.ensureCursorVisible() - QCoreApplication.processEvents() + QApplication.processEvents() def show_output(self, raw): def do_show(): @@ -296,7 +296,7 @@ class Console(QTextEdit): else: do_show() self.ensureCursorVisible() - QCoreApplication.processEvents() + QApplication.processEvents() # }}} @@ -360,14 +360,23 @@ class Console(QTextEdit): def home_pressed(self): if self.prompt_frame is not None: - c = self.cursor - c.movePosition(c.StartOfLine) - c.movePosition(c.NextCharacter, n=self.prompt_len) - self.setTextCursor(c) + mods = QApplication.keyboardModifiers() + ctrl = bool(int(mods & Qt.CTRL)) + if ctrl: + self.cursor_pos = (0, self.prompt_len) + else: + c = self.cursor + c.movePosition(c.StartOfLine) + c.movePosition(c.NextCharacter, n=self.prompt_len) + self.setTextCursor(c) self.ensureCursorVisible() def end_pressed(self): if self.prompt_frame is not None: + mods = QApplication.keyboardModifiers() + ctrl = bool(int(mods & Qt.CTRL)) + if ctrl: + self.cursor_pos = (len(list(self.prompt()))-1, self.prompt_len) c = self.cursor c.movePosition(c.EndOfLine) self.setTextCursor(c) diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index a5a4b42266..a708ca1652 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -52,7 +52,7 @@ class MainWindow(QDialog): self.setWindowTitle(__appname__ + ' console') self.setWindowIcon(QIcon(I('console.png'))) - self.restart_action = QAction(_('Restart'), self) + self.restart_action = QAction(_('Restart console'), self) self.restart_action.setShortcut(_('Ctrl+R')) self.addAction(self.restart_action) self.restart_action.triggered.connect(self.restart) From 7893c01807e401ae6014485e6278ced3a633bb9c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 22 Sep 2010 13:22:02 +0100 Subject: [PATCH 080/235] Three changes: 1) make get_metadata return an unverified list of formats. Avoids a file system operation per format 2) enhancement request #2845 3) permit composite fields as search/replace source fields. --- src/calibre/gui2/dialogs/metadata_bulk.py | 53 +++++++++++++++-------- src/calibre/gui2/dialogs/metadata_bulk.ui | 13 +++++- src/calibre/library/database2.py | 10 +++-- 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 18d00191cc..fa3b1a9aa7 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -32,24 +32,30 @@ class Worker(Thread): remove, add, au, aus, do_aus, rating, pub, do_series, \ do_autonumber, do_remove_format, remove_format, do_swap_ta, \ do_remove_conv, do_auto_author, series, do_series_restart, \ - series_start_value = self.args + series_start_value, do_title_case = self.args # first loop: do author and title. These will commit at the end of each # operation, because each operation modifies the file system. We want to # try hard to keep the DB and the file system in sync, even in the face # of exceptions or forced exits. for id in self.ids: + title_set = False if do_swap_ta: title = self.db.title(id, index_is_id=True) aum = self.db.authors(id, index_is_id=True) if aum: aum = [a.strip().replace('|', ',') for a in aum.split(',')] new_title = authors_to_string(aum) + if do_title_case: + new_title = new_title.title() self.db.set_title(id, new_title, notify=False) + title_set = True if title: new_authors = string_to_authors(title) self.db.set_authors(id, new_authors, notify=False) - + if do_title_case and not title_set: + title = self.db.title(id, index_is_id=True) + self.db.set_title(id, title.title(), notify=False) if au: self.db.set_authors(id, string_to_authors(au), notify=False) @@ -182,19 +188,22 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.search_for.initialize('bulk_edit_search_for') self.replace_with.initialize('bulk_edit_replace_with') self.test_text.initialize('bulk_edit_test_test') - fields = [''] + self.all_fields = [''] + self.writable_fields = [''] fm = self.db.field_metadata for f in fm: if (f in ['author_sort'] or ( - fm[f]['datatype'] == 'text' or fm[f]['datatype'] == 'series') + fm[f]['datatype'] in ['text', 'series']) and fm[f].get('search_terms', None) and f not in ['formats', 'ondevice']): - fields.append(f) - fields.sort() - self.search_field.addItems(fields) - self.search_field.setMaxVisibleItems(min(len(fields), 20)) - self.destination_field.addItems(fields) - self.destination_field.setMaxVisibleItems(min(len(fields), 20)) + self.all_fields.append(f) + self.writable_fields.append(f) + if fm[f]['datatype'] == 'composite': + self.all_fields.append(f) + self.all_fields.sort() + self.writable_fields.sort() + self.search_field.setMaxVisibleItems(20) + self.destination_field.setMaxVisibleItems(20) offset = 10 self.s_r_number_of_books = min(10, len(self.ids)) for i in range(1,self.s_r_number_of_books+1): @@ -262,7 +271,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.replace_func.addItems(sorted(self.s_r_functions.keys())) self.search_mode.currentIndexChanged[int].connect(self.s_r_search_mode_changed) - self.search_field.currentIndexChanged[str].connect(self.s_r_search_field_changed) + self.search_field.currentIndexChanged[int].connect(self.s_r_search_field_changed) self.destination_field.currentIndexChanged[str].connect(self.s_r_destination_field_changed) self.replace_mode.currentIndexChanged[int].connect(self.s_r_paint_results) @@ -293,15 +302,18 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): val = [] return val - def s_r_search_field_changed(self, txt): - txt = unicode(txt) + def s_r_search_field_changed(self, idx): for i in range(0, self.s_r_number_of_books): w = getattr(self, 'book_%d_text'%(i+1)) mi = self.db.get_metadata(self.ids[i], index_is_id=True) src = unicode(self.search_field.currentText()) t = self.s_r_get_field(mi, src) w.setText(''.join(t[0:1])) - self.s_r_paint_results(None) + + if self.search_mode.currentIndex() == 0: + self.destination_field.setCurrentIndex(idx) + else: + self.s_r_paint_results(None) def s_r_destination_field_changed(self, txt): txt = unicode(txt) @@ -314,7 +326,11 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.s_r_paint_results(None) def s_r_search_mode_changed(self, val): + self.search_field.clear() + self.destination_field.clear() if val == 0: + self.search_field.addItems(self.writable_fields) + self.destination_field.addItems(self.writable_fields) self.destination_field.setCurrentIndex(0) self.destination_field.setVisible(False) self.destination_field_label.setVisible(False) @@ -324,6 +340,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.comma_separated.setVisible(False) self.s_r_heading.setText('

'+self.main_heading + self.character_heading) else: + self.search_field.addItems(self.all_fields) + self.destination_field.addItems(self.writable_fields) self.destination_field.setVisible(True) self.destination_field_label.setVisible(True) self.replace_mode.setVisible(True) @@ -367,6 +385,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): return '' dest = unicode(self.destination_field.currentText()) if dest == '': + if self.db.metadata_for_field(src)['datatype'] == 'composite': + raise Exception(_('You must specify a destination when source is a composite field')) dest = src dest_mode = self.replace_mode.currentIndex() @@ -433,8 +453,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): t = self.s_r_replace_mode_separator().join(t) wr.setText(t) except Exception as e: - import traceback - traceback.print_exc() self.s_r_error = e self.s_r_set_colors() break @@ -592,11 +610,12 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): do_swap_ta = self.swap_title_and_author.isChecked() do_remove_conv = self.remove_conversion_settings.isChecked() do_auto_author = self.auto_author_sort.isChecked() + do_title_case = self.change_title_to_title_case.isChecked() args = (remove, add, au, aus, do_aus, rating, pub, do_series, do_autonumber, do_remove_format, remove_format, do_swap_ta, do_remove_conv, do_auto_author, series, do_series_restart, - series_start_value) + series_start_value, do_title_case) bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') %len(self.ids), parent=self) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 10e22c5df9..e03a59b7ea 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -270,6 +270,17 @@ + + + + Change title to title case + + + Force the title to be in title case. If both this and swap authors are checked, +title and author are swapped before the title case is set + + + @@ -340,7 +351,7 @@ Future conversion of these books will use the default settings. - + Qt::Vertical diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 3e7b932808..c72e990738 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -535,7 +535,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): ### The field-style interface. These use field keys. def get_field(self, idx, key, default=None, index_is_id=False): - mi = self.get_metadata(idx, index_is_id=index_is_id, get_cover=True) + mi = self.get_metadata(idx, index_is_id=index_is_id, + get_cover=key == 'cover') return mi.get(key, default) def standard_field_keys(self): @@ -590,7 +591,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.pubdate = self.pubdate(idx, index_is_id=index_is_id) mi.uuid = self.uuid(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) - mi.formats = self.formats(idx, index_is_id=index_is_id) + mi.formats = self.formats(idx, index_is_id=index_is_id, + verify_formats=False) if hasattr(mi.formats, 'split'): mi.formats = mi.formats.split(',') else: @@ -731,7 +733,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): return set([]) return set([f[0] for f in formats]) - def formats(self, index, index_is_id=False): + def formats(self, index, index_is_id=False, verify_formats=True): ''' Return available formats as a comma separated list or None if there are no available formats ''' id = index if index_is_id else self.id(index) try: @@ -739,6 +741,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): formats = map(lambda x:x[0], formats) except: return None + if not verify_formats: + return formats ans = [] for format in formats: if self.format_abspath(id, format, index_is_id=True) is not None: From b1250a6db18366d599ea63e27658d7851d1e1f35 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 22 Sep 2010 16:43:28 +0100 Subject: [PATCH 081/235] Add prefix and postfix to template values. Syntax: either '{key}' or '{txt1|key|txt2}'. In the second case, if val[key] is not empty, then the result is 'txt1' + val[key] + txt2. --- src/calibre/ebooks/metadata/book/base.py | 18 +++++++++++++----- src/calibre/gui2/dialogs/metadata_bulk.py | 9 --------- src/calibre/library/save_to_disk.py | 17 ++++++++++++++++- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 3d6d6b1bb8..d5a86264bf 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -14,8 +14,8 @@ from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS from calibre.ebooks.metadata.book import ALL_METADATA_FIELDS from calibre.library.field_metadata import FieldMetadata -from calibre.utils.date import isoformat, format_date +from calibre.utils.date import isoformat, format_date NULL_VALUES = { @@ -38,10 +38,17 @@ class SafeFormat(string.Formatter): Provides a format function that substitutes '' for any missing value ''' def get_value(self, key, args, mi): - ign, v = mi.format_field(key, series_with_index=False) - if v is None: - return '' - return v + from calibre.library.save_to_disk import explode_string_template_value + try: + prefix, key, suffix = explode_string_template_value(key) + ign, v = mi.format_field(key, series_with_index=False) + if v is None: + return '' + if v is '': + return '' + return '%s%s%s'%(prefix, v, suffix) + except: + return key composite_formatter = SafeFormat() compress_spaces = re.compile(r'\s+') @@ -50,6 +57,7 @@ def format_composite(x, mi): try: ans = composite_formatter.vformat(x, [], mi).strip() except: + traceback.print_exc() ans = x return compress_spaces.sub(' ', ans) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index fa3b1a9aa7..a9e45087fd 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -122,15 +122,6 @@ class SafeFormat(string.Formatter): v = ','.join(v) return v -composite_formatter = SafeFormat() - -def format_composite(x, mi): - try: - ans = composite_formatter.vformat(x, [], mi).strip() - except: - ans = x - return ans - class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): s_r_functions = { '' : lambda x: x, diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index fe62dcb7fd..6f7929a072 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -101,15 +101,30 @@ def preprocess_template(template): template = template.decode(preferred_encoding, 'replace') return template +template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$') + +def explode_string_template_value(key): + try: + matches = template_value_re.match(key) + if matches.lastindex != 3: + return key + return matches.groups() + except: + return '', key, '' + class SafeFormat(string.Formatter): ''' Provides a format function that substitutes '' for any missing value ''' def get_value(self, key, args, kwargs): try: - return kwargs[key] + prefix, key, suffix = explode_string_template_value(key) + if kwargs[key]: + return '%s%s%s'%(prefix, kwargs[key], suffix) + return '' except: return '' + safe_formatter = SafeFormat() def safe_format(x, format_args): From 9112277d00187936e7cc8ffd3bf1eba3b87cfbe7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 09:50:01 -0600 Subject: [PATCH 082/235] ... --- src/calibre/manual/index.rst | 8 +------- src/calibre/manual/tutorials.rst | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/calibre/manual/tutorials.rst diff --git a/src/calibre/manual/index.rst b/src/calibre/manual/index.rst index 40c260b8b5..d63b0b71a9 100644 --- a/src/calibre/manual/index.rst +++ b/src/calibre/manual/index.rst @@ -33,16 +33,10 @@ Sections conversion metadata faq - xpath + tutorials customize cli/cli-index develop glossary -.. toctree:: - :hidden: - :maxdepth: 2 - - template_lang - portable diff --git a/src/calibre/manual/tutorials.rst b/src/calibre/manual/tutorials.rst new file mode 100644 index 0000000000..d07316deb9 --- /dev/null +++ b/src/calibre/manual/tutorials.rst @@ -0,0 +1,17 @@ + +.. include:: global.rst + +.. _tutorials: + +Tutorials +======================================================= + +Here you will find tutorials to get you started using |app|'s more advanced features, like XPath and templates. + +.. toctree:: + :maxdepth: 1 + + xpath + template_lang + portable + From bfc3e63980dd0fc47601529ca1f224602e10f777 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 09:57:33 -0600 Subject: [PATCH 083/235] ... --- src/calibre/library/save_to_disk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 6f7929a072..19727deb17 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -120,7 +120,7 @@ class SafeFormat(string.Formatter): try: prefix, key, suffix = explode_string_template_value(key) if kwargs[key]: - return '%s%s%s'%(prefix, kwargs[key], suffix) + return prefix + kwargs[key] + suffix return '' except: return '' From bd8a206219b69fb92305db8135b28f98021a3b62 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 22 Sep 2010 17:10:57 +0100 Subject: [PATCH 084/235] Changes to faq --- src/calibre/manual/template_lang.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 541b5da138..780d742eff 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -40,7 +40,20 @@ and if a book does not have a series:: Advanced formatting ---------------------- -You can do more than just simple substitution with the templates. You can also control how the substituted data is formatted. For instance, suppose you wanted to ensure that the series_index is always formatted as three digits with leading zeros. This would do the trick:: +You can do more than just simple substitution with the templates. You can also conditionally include text and control how the substituted data is formatted. + +Regarding conditionally including text: there are cases where you might want to have text appear in the output only if a field is not empty. A common case is series and series_index, where you want either nothing or the two values with a hyphen between them. Calibre handles this case using a special field syntax. +For example, assume you want to use the template + + {series} - {series_index} - {title} + +Unfortunately, if the book has no series, the answer will be '- - title'. Many people would rather it be simply 'title', without the hyphens. To do this, use the extended syntax {some_text|field|other_text}. When you use this syntax, if field has the value SERIES then the result will be some_textSERIESother_text. If field has no value, then the result will be the empty string (nothing). Using this syntax, we can solve the above series problem with the template + + {series}{ - |series_index| - }{title} + +The hyphens will be included only if the book has a series index. Note: you must either use no | characters or both of them. Using one, such as in {field| - }, is not allowed. It is OK to not provide any text for one side or the other, such as in {|series| - }. Using {|title|} is the same as using {title}. + +Now to formatting. Suppose you wanted to ensure that the series_index is always formatted as three digits with leading zeros. This would do the trick:: {series_index:0>3s} - Three digits with leading zeros From f280cc956fa7b234212ed995fd7497b29b9ac5ea Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 22 Sep 2010 20:56:08 +0100 Subject: [PATCH 085/235] Fix template bugs introduced by using + instead of '%s' --- src/calibre/ebooks/metadata/book/base.py | 4 ++-- src/calibre/library/save_to_disk.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 39b9b34174..4e78bf5a48 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -43,9 +43,9 @@ class SafeFormat(string.Formatter): ign, v = mi.format_field(key, series_with_index=False) if v is None: return '' - if v is '': + if v == '': return '' - return prefix + v + suffix + return prefix + unicode(v) + suffix except: return key diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 19727deb17..90e5413389 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -101,7 +101,8 @@ def preprocess_template(template): template = template.decode(preferred_encoding, 'replace') return template -template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$') +template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$', + flags= re.UNICODE) def explode_string_template_value(key): try: @@ -120,7 +121,7 @@ class SafeFormat(string.Formatter): try: prefix, key, suffix = explode_string_template_value(key) if kwargs[key]: - return prefix + kwargs[key] + suffix + return prefix + unicode(kwargs[key]) + suffix return '' except: return '' From 8a9ae38ebff2cc641d2d661da2d6577db7f0acd0 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 22 Sep 2010 21:00:25 +0100 Subject: [PATCH 086/235] Change to fix to make the value unicode in format_field_extended. This is a more general fix. Note that the orig_field has not been changed. --- src/calibre/ebooks/metadata/book/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 4e78bf5a48..a2b2790ed9 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -45,7 +45,7 @@ class SafeFormat(string.Formatter): return '' if v == '': return '' - return prefix + unicode(v) + suffix + return prefix + v + suffix except: return key @@ -444,7 +444,7 @@ class Metadata(object): res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') - return (name, res, orig_res, cmeta) + return (name, unicode(res), orig_res, cmeta) if key in field_metadata and field_metadata[key]['kind'] == 'field': res = self.get(key, None) @@ -462,7 +462,7 @@ class Metadata(object): res = res + ' [%s]'%self.format_series_index() elif datatype == 'datetime': res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy')) - return (name, res, orig_res, fmeta) + return (name, unicode(res), orig_res, fmeta) return (None, None, None, None) From 7e233696a1c2bbe3ca4c0469a99540da665fc94f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 16:11:53 -0600 Subject: [PATCH 087/235] ... --- src/calibre/manual/tutorials.rst | 1 + src/calibre/utils/pyconsole/__init__.py | 4 ++-- src/calibre/utils/pyconsole/main.py | 22 +++++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/calibre/manual/tutorials.rst b/src/calibre/manual/tutorials.rst index d07316deb9..1e4cab8493 100644 --- a/src/calibre/manual/tutorials.rst +++ b/src/calibre/manual/tutorials.rst @@ -11,6 +11,7 @@ Here you will find tutorials to get you started using |app|'s more advanced feat .. toctree:: :maxdepth: 1 + news xpath template_lang portable diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index 32eb926143..cf7e5eab50 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en' import sys from calibre import prints as prints_ -from calibre.utils.config import Config, ConfigProxy +from calibre.utils.config import Config, ConfigProxy, JSONConfig def console_config(): @@ -20,7 +20,7 @@ def console_config(): return c prefs = ConfigProxy(console_config()) - +dynamic = JSONConfig('console') def prints(*args, **kwargs): kwargs['file'] = sys.__stdout__ diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index a708ca1652..4027897ddd 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -12,6 +12,7 @@ from PyQt4.Qt import QDialog, QToolBar, QStatusBar, QLabel, QFont, Qt, \ QApplication, QIcon, QVBoxLayout, QAction from calibre.constants import __appname__, __version__ +from calibre.utils.pyconsole import dynamic from calibre.utils.pyconsole.console import Console class MainWindow(QDialog): @@ -26,6 +27,9 @@ class MainWindow(QDialog): self.setLayout(self.l) self.resize(800, 600) + geom = dynamic.get('console_window_geometry', None) + if geom is not None: + self.restoreGeometry(geom) # Setup tool bar {{{ self.tool_bar = QToolBar(self) @@ -62,17 +66,25 @@ class MainWindow(QDialog): self.restart_requested = True self.reject() -def main(): - QApplication.setApplicationName(__appname__+' console') - QApplication.setOrganizationName('Kovid Goyal') - app = QApplication([]) - app + def closeEvent(self, *args): + dynamic.set('console_window_geometry', + bytearray(self.saveGeometry())) + return QDialog.closeEvent(self, *args) + + +def show(): while True: m = MainWindow() m.exec_() if not m.restart_requested: break +def main(): + QApplication.setApplicationName(__appname__+' console') + QApplication.setOrganizationName('Kovid Goyal') + app = QApplication([]) + app + show() if __name__ == '__main__': main() From 69e4cb006545c9db1bc7704c4363a9a111d9c3c1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 17:05:35 -0600 Subject: [PATCH 088/235] ... --- src/calibre/utils/pyconsole/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index cf7e5eab50..b3f811faca 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -9,6 +9,7 @@ import sys from calibre import prints as prints_ from calibre.utils.config import Config, ConfigProxy, JSONConfig +from calibre.utils.ipc.launch import Worker def console_config(): @@ -26,4 +27,6 @@ def prints(*args, **kwargs): kwargs['file'] = sys.__stdout__ prints_(*args, **kwargs) +class Process(Worker): + pass From c5e26ad9d5660aebdc21afc57e0626e83b2c0b92 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 21:43:08 -0600 Subject: [PATCH 089/235] Refactor console to run interpreter in separate process --- src/calibre/utils/pyconsole/__init__.py | 3 + src/calibre/utils/pyconsole/console.py | 114 ++++++++----- src/calibre/utils/pyconsole/controller.py | 125 +++++++++++++++ src/calibre/utils/pyconsole/interpreter.py | 177 +++++++++++++++++++++ src/calibre/utils/pyconsole/main.py | 1 + src/calibre/utils/pyconsole/repl.py | 67 -------- 6 files changed, 381 insertions(+), 106 deletions(-) create mode 100644 src/calibre/utils/pyconsole/controller.py create mode 100644 src/calibre/utils/pyconsole/interpreter.py delete mode 100644 src/calibre/utils/pyconsole/repl.py diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index 3b32a5a9f3..3be9382413 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -13,6 +13,9 @@ from calibre.utils.ipc.launch import Worker from calibre.constants import __appname__, __version__, iswindows from calibre.gui2 import error_dialog +# Time to wait for communication to/from the interpreter process +POLL_TIMEOUT = 0.01 # seconds + preferred_encoding, isbytestring, __appname__, __version__, error_dialog, \ iswindows diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 77c8d9a2f6..1acb6e96a9 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -9,13 +9,13 @@ import sys, textwrap, traceback, StringIO from functools import partial from PyQt4.Qt import QTextEdit, Qt, QTextFrameFormat, pyqtSignal, \ - QApplication, QColor, QPalette, QMenu, QActionGroup + QApplication, QColor, QPalette, QMenu, QActionGroup, QTimer from pygments.lexers import PythonLexer, PythonTracebackLexer from pygments.styles import get_all_styles from calibre.utils.pyconsole.formatter import Formatter -from calibre.utils.pyconsole.repl import Interpreter, DummyFile +from calibre.utils.pyconsole.controller import Controller from calibre.utils.pyconsole import prints, prefs, __appname__, \ __version__, error_dialog @@ -113,7 +113,8 @@ class Console(QTextEdit): continuation='... ', parent=None): QTextEdit.__init__(self, parent) - self.buf = [] + self.shutting_down = False + self.buf = self.old_buf = [] self.prompt_frame = None self.allow_output = False self.prompt_frame_format = QTextFrameFormat() @@ -152,20 +153,80 @@ class Console(QTextEdit): '''.format(sys.version.splitlines()[0], __appname__, __version__)) + self.controllers = [] + QTimer.singleShot(0, self.launch_controller) + + sys.excepthook = self.unhandled_exception + with EditBlock(self.cursor): self.render_block(motd) - sys.stdout = sys.stderr = DummyFile(parent=self) - sys.stdout.write_output.connect(self.show_output) - self.interpreter = Interpreter(parent=self) - self.interpreter.show_error.connect(self.show_error) - - sys.excepthook = self.unhandled_exception + def shutdown(self): + self.shutton_down = True + for c in self.controllers: + c.kill() def contextMenuEvent(self, event): self.context_menu.popup(event.globalPos()) event.accept() + # Controller management {{{ + @property + def controller(self): + return self.controllers[-1] + + def no_controller_error(self): + error_dialog(self, _('No interpreter'), + _('No active interpreter found. Try restarting the' + ' console'), show=True) + + def launch_controller(self, *args): + c = Controller(self) + c.write_output.connect(self.show_output, type=Qt.QueuedConnection) + c.show_error.connect(self.show_error, type=Qt.QueuedConnection) + c.interpreter_died.connect(self.interpreter_died, + type=Qt.QueuedConnection) + c.interpreter_done.connect(self.execution_done) + self.controllers.append(c) + + def interpreter_died(self, controller, returncode): + if not self.shutting_down and controller.current_command is not None: + error_dialog(self, _('Interpreter died'), + _('Interpreter dies while excuting a command. To see ' + 'the command, click Show details'), + det_msg=controller.current_command, show=True) + + def execute(self, prompt_lines): + c = self.root_frame.lastCursorPosition() + self.setTextCursor(c) + self.old_prompt_frame = self.prompt_frame + self.prompt_frame = None + self.old_buf = self.buf + self.buf = [] + self.running.emit() + self.controller.runsource('\n'.join(prompt_lines)) + + def execution_done(self, controller, ret): + if controller is self.controller: + self.running_done.emit() + if ret: # Incomplete command + self.buf = self.old_buf + self.prompt_frame = self.old_prompt_frame + c = self.prompt_frame.lastCursorPosition() + c.insertBlock() + self.setTextCursor(c) + else: # Command completed + try: + self.old_prompt_frame.setFrameFormat(QTextFrameFormat()) + except RuntimeError: + # Happens if enough lines of output that the old + # frame was deleted + pass + + self.render_current_prompt() + + # }}} + # Prompt management {{{ @dynamic_property @@ -264,7 +325,7 @@ class Console(QTextEdit): if restore_prompt: self.render_current_prompt() - def show_error(self, is_syntax_err, tb): + def show_error(self, is_syntax_err, tb, controller=None): if self.prompt_frame is not None: # At a prompt, so redirect output return prints(tb, end='') @@ -279,7 +340,7 @@ class Console(QTextEdit): self.ensureCursorVisible() QApplication.processEvents() - def show_output(self, raw): + def show_output(self, raw, which='stdout', controller=None): def do_show(): try: self.buf.append(raw) @@ -384,36 +445,11 @@ class Console(QTextEdit): def enter_pressed(self): if self.prompt_frame is None: return + if not self.controller.is_alive: + return self.no_controller_error() cp = list(self.prompt()) if cp[0]: - c = self.root_frame.lastCursorPosition() - self.setTextCursor(c) - old_pf = self.prompt_frame - self.prompt_frame = None - oldbuf = self.buf - self.buf = [] - self.running.emit() - try: - ret = self.interpreter.runsource('\n'.join(cp)) - except SystemExit: - ret = False - self.show_output('Raising SystemExit not allowed\n') - self.running_done.emit() - if ret: # Incomplete command - self.buf = oldbuf - self.prompt_frame = old_pf - c = old_pf.lastCursorPosition() - c.insertBlock() - self.setTextCursor(c) - else: # Command completed - try: - old_pf.setFrameFormat(QTextFrameFormat()) - except RuntimeError: - # Happens if enough lines of output that the old - # frame was deleted - pass - - self.render_current_prompt() + self.execute(cp) def text_typed(self, text): if self.prompt_frame is not None: diff --git a/src/calibre/utils/pyconsole/controller.py b/src/calibre/utils/pyconsole/controller.py new file mode 100644 index 0000000000..173881d14e --- /dev/null +++ b/src/calibre/utils/pyconsole/controller.py @@ -0,0 +1,125 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import os, cPickle, signal, time +from Queue import Queue, Empty +from multiprocessing.connection import Listener, arbitrary_address +from binascii import hexlify + +from PyQt4.Qt import QThread, pyqtSignal + +from calibre.utils.pyconsole import Process, iswindows, POLL_TIMEOUT + +class Controller(QThread): + + # show_error(is_syntax_error, traceback, self) + show_error = pyqtSignal(object, object, object) + # write_output(unicode_object, stdout or stderr, self) + write_output = pyqtSignal(object, object, object) + # Indicates interpreter has finished evaluating current command + interpreter_done = pyqtSignal(object, object) + # interpreter_died(self, returncode or None if no return code available) + interpreter_died = pyqtSignal(object, object) + + def __init__(self, parent): + QThread.__init__(self, parent) + self.keep_going = True + self.current_command = None + + self.out_queue = Queue() + self.address = arbitrary_address('AF_PIPE' if iswindows else 'AF_UNIX') + self.auth_key = os.urandom(32) + if iswindows and self.address[1] == ':': + self.address = self.address[2:] + self.listener = Listener(address=self.address, + authkey=self.auth_key, backlog=4) + + self.env = { + 'CALIBRE_LAUNCH_INTERPRETER': '1', + 'CALIBRE_WORKER_ADDRESS': + hexlify(cPickle.dumps(self.listener.address, -1)), + 'CALIBRE_WORKER_KEY': hexlify(self.auth_key) + } + self.process = Process(self.env) + self.output_file_buf = self.process(redirect_output=False) + self.conn = self.listener.accept() + self.start() + + def run(self): + while self.keep_going and self.is_alive: + try: + self.communicate() + except KeyboardInterrupt: + pass + except EOFError: + break + self.interpreter_died.emit(self, self.returncode) + try: + self.listener.close() + except: + pass + + def communicate(self): + if self.conn.poll(POLL_TIMEOUT): + self.dispatch_incoming_message(self.conn.recv()) + try: + obj = self.out_queue.get_nowait() + except Empty: + pass + else: + try: + self.conn.send(obj) + except: + raise EOFError('controller failed to send') + + def dispatch_incoming_message(self, obj): + try: + cmd, data = obj + except: + print 'Controller received invalid message' + print repr(obj) + return + if cmd in ('stdout', 'stderr'): + self.write_output.emit(data, cmd, self) + elif cmd == 'syntaxerror': + self.show_error.emit(True, data, self) + elif cmd == 'traceback': + self.show_error(self, False, data) + elif cmd == 'done': + self.current_command = None + self.interpreter_done.emit(self, data) + + def runsource(self, cmd): + self.current_command = cmd + self.out_queue.put(('run', cmd)) + + def __nonzero__(self): + return self.process.is_alive + + @property + def returncode(self): + return self.process.returncode + + @property + def interrupt(self): + if hasattr(signal, 'SIGINT'): + os.kill(self.process.pid, signal.SIGINT) + elif hasattr(signal, 'CTRL_C_EVENT'): + os.kill(self.process.pid, signal.CTRL_C_EVENT) + + @property + def is_alive(self): + return self.process.is_alive + + def kill(self): + self.out_queue.put(('quit', 0)) + t = 0 + while self.is_alive and t < 10: + time.sleep(0.1) + self.process.kill() + self.keep_going = False + diff --git a/src/calibre/utils/pyconsole/interpreter.py b/src/calibre/utils/pyconsole/interpreter.py new file mode 100644 index 0000000000..6a1aff26c9 --- /dev/null +++ b/src/calibre/utils/pyconsole/interpreter.py @@ -0,0 +1,177 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import sys, cPickle, os +from code import InteractiveInterpreter +from Queue import Queue, Empty +from threading import Thread +from binascii import unhexlify +from multiprocessing.connection import Client + +from calibre.utils.pyconsole import preferred_encoding, isbytestring, \ + POLL_TIMEOUT + +''' +Messages sent by client: + + (stdout, unicode) + (stderr, unicode) + (syntaxerror, unicode) + (traceback, unicode) + (done, True iff incomplete command) + +Messages that can be received by client: + (quit, return code) + (run, unicode) + +''' + +def tounicode(raw): # {{{ + if isbytestring(raw): + try: + raw = raw.decode(preferred_encoding, 'replace') + except: + raw = repr(raw) + + if isbytestring(raw): + try: + raw.decode('utf-8', 'replace') + except: + raw = u'Undecodable bytestring' + return raw +# }}} + +class DummyFile(object): # {{{ + + def __init__(self, what, out_queue): + self.closed = False + self.name = 'console' + self.softspace = 0 + self.what = what + self.out_queue = out_queue + + def flush(self): + pass + + def close(self): + pass + + def write(self, raw): + self.out_queue.put((self.what, tounicode(raw))) +# }}} + +class Comm(Thread): # {{{ + + def __init__(self, conn, out_queue, in_queue): + Thread.__init__(self) + self.daemon = True + self.conn = conn + self.out_queue = out_queue + self.in_queue = in_queue + self.keep_going = True + + def run(self): + while self.keep_going: + try: + self.communicate() + except KeyboardInterrupt: + pass + except EOFError: + pass + + def communicate(self): + if self.conn.poll(POLL_TIMEOUT): + try: + obj = self.conn.recv() + except: + pass + else: + self.in_queue.put(obj) + try: + obj = self.out_queue.get_nowait() + except Empty: + pass + else: + try: + self.conn.send(obj) + except: + raise EOFError('interpreter failed to send') +# }}} + +class Interpreter(InteractiveInterpreter): # {{{ + + def __init__(self, queue, local={}): + if '__name__' not in local: + local['__name__'] = '__console__' + if '__doc__' not in local: + local['__doc__'] = None + self.out_queue = queue + sys.stdout = DummyFile('stdout', queue) + sys.stderr = DummyFile('sdterr', queue) + InteractiveInterpreter.__init__(self, locals=local) + + def showtraceback(self, *args, **kwargs): + self.is_syntax_error = False + InteractiveInterpreter.showtraceback(self, *args, **kwargs) + + def showsyntaxerror(self, *args, **kwargs): + self.is_syntax_error = True + InteractiveInterpreter.showsyntaxerror(self, *args, **kwargs) + + def write(self, raw): + what = 'syntaxerror' if self.is_syntax_error else 'traceback' + self.out_queue.put((what, tounicode(raw))) + +# }}} + +def connect(): + os.chdir(os.environ['ORIGWD']) + address = cPickle.loads(unhexlify(os.environ['CALIBRE_WORKER_ADDRESS'])) + key = unhexlify(os.environ['CALIBRE_WORKER_KEY']) + return Client(address, authkey=key) + +def main(): + out_queue = Queue() + in_queue = Queue() + conn = connect() + comm = Comm(conn, out_queue, in_queue) + comm.start() + interpreter = Interpreter(out_queue) + + ret = 0 + + while True: + try: + try: + cmd, data = in_queue.get(1) + except Empty: + pass + else: + if cmd == 'quit': + ret = data + comm.keep_going = False + comm.join() + break + elif cmd == 'run': + if not comm.is_alive(): + ret = 1 + break + ret = False + try: + ret = interpreter.runsource(data) + except KeyboardInterrupt: + pass + except SystemExit: + out_queue.put(('stderr', 'SystemExit ignored\n')) + out_queue.put(('done', ret)) + except KeyboardInterrupt: + pass + + return ret + +if __name__ == '__main__': + main() diff --git a/src/calibre/utils/pyconsole/main.py b/src/calibre/utils/pyconsole/main.py index a64bc15ec7..664f41ef2e 100644 --- a/src/calibre/utils/pyconsole/main.py +++ b/src/calibre/utils/pyconsole/main.py @@ -68,6 +68,7 @@ class MainWindow(QDialog): def closeEvent(self, *args): dynamic.set('console_window_geometry', bytearray(self.saveGeometry())) + self.console.shutdown() return QDialog.closeEvent(self, *args) diff --git a/src/calibre/utils/pyconsole/repl.py b/src/calibre/utils/pyconsole/repl.py deleted file mode 100644 index de6262de14..0000000000 --- a/src/calibre/utils/pyconsole/repl.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python -# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai - -__license__ = 'GPL v3' -__copyright__ = '2010, Kovid Goyal ' -__docformat__ = 'restructuredtext en' - -from code import InteractiveInterpreter - -from PyQt4.Qt import QObject, pyqtSignal - -from calibre import isbytestring -from calibre.constants import preferred_encoding - -class Interpreter(QObject, InteractiveInterpreter): - - # show_error(is_syntax_error, traceback) - show_error = pyqtSignal(object, object) - - def __init__(self, local={}, parent=None): - QObject.__init__(self, parent) - if '__name__' not in local: - local['__name__'] = '__console__' - if '__doc__' not in local: - local['__doc__'] = None - InteractiveInterpreter.__init__(self, locals=local) - - def showtraceback(self, *args, **kwargs): - self.is_syntax_error = False - InteractiveInterpreter.showtraceback(self, *args, **kwargs) - - def showsyntaxerror(self, *args, **kwargs): - self.is_syntax_error = True - InteractiveInterpreter.showsyntaxerror(self, *args, **kwargs) - - def write(self, tb): - self.show_error.emit(self.is_syntax_error, tb) - -class DummyFile(QObject): - - # write_output(unicode_object) - write_output = pyqtSignal(object) - - def __init__(self, parent=None): - QObject.__init__(self, parent) - self.closed = False - self.name = 'console' - self.softspace = 0 - - def flush(self): - pass - - def close(self): - pass - - def write(self, raw): - #import sys, traceback - #print >> sys.__stdout__, 'file,write stack:\n', ''.join(traceback.format_stack()) - if isbytestring(raw): - try: - raw = raw.decode(preferred_encoding, 'replace') - except: - raw = repr(raw) - if isbytestring(raw): - raw = raw.decode(preferred_encoding, 'replace') - self.write_output.emit(raw) - From 950f592b87173daaeb84244560c276adb0cb49f8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 21:48:17 -0600 Subject: [PATCH 090/235] ... --- src/calibre/utils/pyconsole/console.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 1acb6e96a9..2611965345 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -268,6 +268,11 @@ class Console(QTextEdit): return property(fget=fget, fset=fset, doc=doc) + def move_cursor_to_prompt(self): + if self.prompt_frame is not None and self.cursor_pos[0] < 0: + c = self.prompt_frame.lastCursorPosition() + self.setTextCursor(c) + def prompt(self, strip_prompt_strings=True): if not self.prompt_frame: yield u'' if strip_prompt_strings else self.formatter.prompt @@ -453,6 +458,7 @@ class Console(QTextEdit): def text_typed(self, text): if self.prompt_frame is not None: + self.move_cursor_to_prompt() self.cursor.insertText(text) self.render_current_prompt(restore_cursor=True) From 9b44f557850a7cdbceac98194cc9bda77d76330c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 Sep 2010 21:54:58 -0600 Subject: [PATCH 091/235] ... --- src/calibre/utils/pyconsole/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/utils/pyconsole/controller.py b/src/calibre/utils/pyconsole/controller.py index 173881d14e..368e665079 100644 --- a/src/calibre/utils/pyconsole/controller.py +++ b/src/calibre/utils/pyconsole/controller.py @@ -88,7 +88,7 @@ class Controller(QThread): elif cmd == 'syntaxerror': self.show_error.emit(True, data, self) elif cmd == 'traceback': - self.show_error(self, False, data) + self.show_error.emit(False, data, self) elif cmd == 'done': self.current_command = None self.interpreter_done.emit(self, data) From d9e5e74695e82e56b8cc0f61399036ea17a485dd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Sep 2010 01:02:03 -0600 Subject: [PATCH 092/235] Console now has history --- src/calibre/utils/pyconsole/__init__.py | 2 + src/calibre/utils/pyconsole/console.py | 62 ++++++++++++++++++++-- src/calibre/utils/pyconsole/controller.py | 1 - src/calibre/utils/pyconsole/interpreter.py | 3 +- 4 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/calibre/utils/pyconsole/__init__.py b/src/calibre/utils/pyconsole/__init__.py index 3be9382413..6ef9f04d4b 100644 --- a/src/calibre/utils/pyconsole/__init__.py +++ b/src/calibre/utils/pyconsole/__init__.py @@ -24,6 +24,8 @@ def console_config(): c = Config('console', desc) c.add_opt('theme', default='native', help='The color theme') + c.add_opt('scrollback', default=10000, + help='Max number of lines to keep in the scrollback buffer') return c diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 2611965345..14670fdb59 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -7,6 +7,7 @@ __docformat__ = 'restructuredtext en' import sys, textwrap, traceback, StringIO from functools import partial +from codeop import CommandCompiler from PyQt4.Qt import QTextEdit, Qt, QTextFrameFormat, pyqtSignal, \ QApplication, QColor, QPalette, QMenu, QActionGroup, QTimer @@ -16,8 +17,9 @@ from pygments.styles import get_all_styles from calibre.utils.pyconsole.formatter import Formatter from calibre.utils.pyconsole.controller import Controller +from calibre.utils.pyconsole.history import History from calibre.utils.pyconsole import prints, prefs, __appname__, \ - __version__, error_dialog + __version__, error_dialog, dynamic class EditBlock(object): # {{{ @@ -73,6 +75,7 @@ class ThemeMenu(QMenu): # {{{ # }}} + class Console(QTextEdit): running = pyqtSignal() @@ -114,7 +117,9 @@ class Console(QTextEdit): parent=None): QTextEdit.__init__(self, parent) self.shutting_down = False + self.compiler = CommandCompiler() self.buf = self.old_buf = [] + self.history = History([''], dynamic.get('console_history', [])) self.prompt_frame = None self.allow_output = False self.prompt_frame_format = QTextFrameFormat() @@ -122,7 +127,7 @@ class Console(QTextEdit): self.prompt_frame_format.setBorderStyle(QTextFrameFormat.BorderStyle_Solid) self.prompt_len = len(prompt) - self.doc.setMaximumBlockCount(10000) + self.doc.setMaximumBlockCount(int(prefs['scrollback'])) self.lexer = PythonLexer(ensurenl=False) self.tb_lexer = PythonTracebackLexer() @@ -139,6 +144,8 @@ class Console(QTextEdit): self.key_dispatcher = { # {{{ Qt.Key_Enter : self.enter_pressed, Qt.Key_Return : self.enter_pressed, + Qt.Key_Up : self.up_pressed, + Qt.Key_Down : self.down_pressed, Qt.Key_Home : self.home_pressed, Qt.Key_End : self.end_pressed, Qt.Key_Left : self.left_pressed, @@ -153,15 +160,17 @@ class Console(QTextEdit): '''.format(sys.version.splitlines()[0], __appname__, __version__)) + sys.excepthook = self.unhandled_exception + self.controllers = [] QTimer.singleShot(0, self.launch_controller) - sys.excepthook = self.unhandled_exception with EditBlock(self.cursor): self.render_block(motd) def shutdown(self): + dynamic.set('console_history', self.history.serialize()) self.shutton_down = True for c in self.controllers: c.kill() @@ -365,7 +374,7 @@ class Console(QTextEdit): # }}} - # Keyboard handling {{{ + # Keyboard management {{{ def keyPressEvent(self, ev): text = unicode(ev.text()) @@ -394,6 +403,20 @@ class Console(QTextEdit): self.setTextCursor(c) self.ensureCursorVisible() + def up_pressed(self): + lineno, pos = self.cursor_pos + if lineno < 0: return + if lineno == 0: + b = self.history.back() + if b is not None: + self.set_prompt(b) + else: + c = self.cursor + c.movePosition(c.Up) + self.setTextCursor(c) + self.ensureCursorVisible() + + def backspace_pressed(self): lineno, pos = self.cursor_pos if lineno < 0: return @@ -414,7 +437,6 @@ class Console(QTextEdit): lineno, pos = self.cursor_pos if lineno < 0: return c = self.cursor - lineno, pos = self.cursor_pos cp = list(self.prompt(False)) if pos < len(cp[lineno]): c.movePosition(c.NextCharacter) @@ -423,6 +445,22 @@ class Console(QTextEdit): self.setTextCursor(c) self.ensureCursorVisible() + def down_pressed(self): + lineno, pos = self.cursor_pos + if lineno < 0: return + c = self.cursor + cp = list(self.prompt(False)) + if lineno >= len(cp) - 1: + b = self.history.forward() + if b is not None: + self.set_prompt(b) + else: + c = self.cursor + c.movePosition(c.Down) + self.setTextCursor(c) + self.ensureCursorVisible() + + def home_pressed(self): if self.prompt_frame is not None: mods = QApplication.keyboardModifiers() @@ -454,6 +492,19 @@ class Console(QTextEdit): return self.no_controller_error() cp = list(self.prompt()) if cp[0]: + try: + ret = self.compiler('\n'.join(cp)) + except: + pass + else: + if ret is None: + c = self.prompt_frame.lastCursorPosition() + c.insertBlock() + self.setTextCursor(c) + self.render_current_prompt() + return + else: + self.history.enter(cp) self.execute(cp) def text_typed(self, text): @@ -461,6 +512,7 @@ class Console(QTextEdit): self.move_cursor_to_prompt() self.cursor.insertText(text) self.render_current_prompt(restore_cursor=True) + self.history.current = list(self.prompt()) # }}} diff --git a/src/calibre/utils/pyconsole/controller.py b/src/calibre/utils/pyconsole/controller.py index 368e665079..d372cb4ebc 100644 --- a/src/calibre/utils/pyconsole/controller.py +++ b/src/calibre/utils/pyconsole/controller.py @@ -104,7 +104,6 @@ class Controller(QThread): def returncode(self): return self.process.returncode - @property def interrupt(self): if hasattr(signal, 'SIGINT'): os.kill(self.process.pid, signal.SIGINT) diff --git a/src/calibre/utils/pyconsole/interpreter.py b/src/calibre/utils/pyconsole/interpreter.py index 6a1aff26c9..3cd0d94711 100644 --- a/src/calibre/utils/pyconsole/interpreter.py +++ b/src/calibre/utils/pyconsole/interpreter.py @@ -11,6 +11,7 @@ from Queue import Queue, Empty from threading import Thread from binascii import unhexlify from multiprocessing.connection import Client +from repr import repr as safe_repr from calibre.utils.pyconsole import preferred_encoding, isbytestring, \ POLL_TIMEOUT @@ -35,7 +36,7 @@ def tounicode(raw): # {{{ try: raw = raw.decode(preferred_encoding, 'replace') except: - raw = repr(raw) + raw = safe_repr(raw) if isbytestring(raw): try: From ea29f4b683ada1c41593ff90664cfa146008be5f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 23 Sep 2010 14:36:47 +0100 Subject: [PATCH 093/235] Changes: 1) complete rewrite of composite field processing -- creation of of formatter class in utils -- change template validator (prefs/save_template.py) to use new formatting class -- change save_to_disk to use new formatting class -- change Metadata class to use new formatting class -- Check for mutually recursive composite fields -- change caches.py to use the 'get' interface (now the right one) for composites 2) Add template validation to the base deviceconfig plugin. It checks if the display widget has a 'validate' method, and if so, it calls it. 3) Change models.py so that composite templates can be edited on the library display. -- back out the changes that set 'editable = False' 4) Fix problem in models.py where book info view was not being updated when a field is changed on library display 5) Changed save_to_disk to permit slashes in field specifications. Did this by splitting the template after template processing. This gives us basic variable folder structures Example: Simple example: we want the folder structure series/series_index - title. If series does not exist, then the title should be in the top folder. Template: {series:||/}{series_index:|| - }{title} 6) Change syntax for extended templates -- prefixes and suffixes have moved to the end of the field specification. Syntax: {series:|prefix value|suffix value} You can put a standard python format specification between the : and the first |. Either zero or two bars must be present. 7) Addition of some built-in functions to template processing. These appear in the format part. Syntax: {title:uppercase()|prefix value|suffix value} Functions apply to the value of the field in the format specification. The functions available are: -- uppercase(), lowercase(), titlecase(), capitalise() -- ifempty(text) If the field is empty, replace it with text. -- shorten(from start, center string, from end) Replace the field with a shortened version. The shortened version is found by joining the field's first 'from start' characters, the center string, and the field's last 'from end' characters. Example: assume that the title is 'Values of beta will give rise to dom'. The field specification {title:shorten(6,---,6)} will produce the result 'Values---to dom' -- lookup(key if field not empty, key if field empty) Replace the value of 'field' with the value of another field. The first field key (lookup name) is used if 'field' is not empty. The second field key is used if field is empty. This, coupled with composite fields and the change to save_to_disk above, facilitates complex variable folder trees on devices. Example: If a book has a series, then we want the folder structure series/series index - title.fmt. If the book does not have a series, then we want the folder structure genre/author_sort/title.fmt. If the book has no genre, use 'Unknown'. To accomplish this, we: 1) create a composite field named AA containing '{series:||}/{series_index} - {title'. 2) create a composite field named BB containing '{#genre:ifempty(Unknown)}/{author_sort}/{title} 3) set the save template to '{series:lookup(AA,BB)} --- src/calibre/ebooks/metadata/book/base.py | 50 ++++---- src/calibre/gui2/custom_column_widgets.py | 2 + .../gui2/device_drivers/configwidget.py | 15 +++ src/calibre/gui2/library/delegates.py | 28 ++++- src/calibre/gui2/library/models.py | 12 +- src/calibre/gui2/library/views.py | 6 +- src/calibre/gui2/preferences/columns.py | 3 +- .../gui2/preferences/create_custom_column.py | 4 - src/calibre/gui2/preferences/plugins.py | 6 +- src/calibre/gui2/preferences/save_template.py | 14 +-- src/calibre/library/caches.py | 2 +- src/calibre/library/save_to_disk.py | 29 +---- src/calibre/utils/formatter.py | 113 ++++++++++++++++++ 13 files changed, 210 insertions(+), 74 deletions(-) create mode 100644 src/calibre/utils/formatter.py diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index a2b2790ed9..16819cbd39 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -5,7 +5,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import copy, re, string, traceback +import copy, re, traceback from calibre import prints from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS @@ -15,6 +15,7 @@ from calibre.ebooks.metadata.book import TOP_LEVEL_CLASSIFIERS from calibre.ebooks.metadata.book import ALL_METADATA_FIELDS from calibre.library.field_metadata import FieldMetadata from calibre.utils.date import isoformat, format_date +from calibre.utils.formatter import TemplateFormatter NULL_VALUES = { @@ -32,33 +33,19 @@ NULL_VALUES = { field_metadata = FieldMetadata() -class SafeFormat(string.Formatter): - ''' - Provides a format function that substitutes '' for any missing value - ''' +class SafeFormat(TemplateFormatter): def get_value(self, key, args, mi): - from calibre.library.save_to_disk import explode_string_template_value try: - prefix, key, suffix = explode_string_template_value(key) ign, v = mi.format_field(key, series_with_index=False) if v is None: return '' if v == '': return '' - return prefix + v + suffix + return v except: return key composite_formatter = SafeFormat() -compress_spaces = re.compile(r'\s+') - -def format_composite(x, mi): - try: - ans = composite_formatter.vformat(x, [], mi).strip() - except: - traceback.print_exc() - ans = x - return compress_spaces.sub(' ', ans) class Metadata(object): @@ -75,7 +62,9 @@ class Metadata(object): @param authors: List of strings or [] @param other: None or a metadata object ''' - object.__setattr__(self, '_data', copy.deepcopy(NULL_VALUES)) + _data = copy.deepcopy(NULL_VALUES) + object.__setattr__(self, '_data', _data) + _data['_curseq'] = _data['_compseq'] = 0 if other is not None: self.smart_update(other) else: @@ -98,14 +87,28 @@ class Metadata(object): pass if field in _data['user_metadata'].iterkeys(): d = _data['user_metadata'][field] - if d['datatype'] != 'composite': - return d['#value#'] - return format_composite(d['display']['composite_template'], self) + val = d['#value#'] + if d['datatype'] != 'composite' or \ + (_data['_curseq'] == _data['_compseq'] and val is not None): + return val + # Data in the structure has changed. Recompute the composite fields + _data['_compseq'] = _data['_curseq'] + for ck in _data['user_metadata']: + cf = _data['user_metadata'][ck] + if cf['datatype'] != 'composite': + continue + cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field + cf['#value#'] = composite_formatter.safe_format( + d['display']['composite_template'], + self, _('TEMPLATE ERROR')).strip() + return d['#value#'] + raise AttributeError( 'Metadata object has no attribute named: '+ repr(field)) def __setattr__(self, field, val, extra=None): _data = object.__getattribute__(self, '_data') + _data['_curseq'] += 1 if field in TOP_LEVEL_CLASSIFIERS: _data['classifiers'].update({field: val}) elif field in STANDARD_METADATA_FIELDS: @@ -193,7 +196,7 @@ class Metadata(object): if v is not None: result[attr] = v for attr in _data['user_metadata'].iterkeys(): - v = _data['user_metadata'][attr]['#value#'] + v = self.get(attr, None) if v is not None: result[attr] = v if _data['user_metadata'][attr]['datatype'] == 'series': @@ -466,9 +469,6 @@ class Metadata(object): return (None, None, None, None) - def expand_template(self, template): - return format_composite(template, self) - def __unicode__(self): from calibre.ebooks.metadata import authors_to_string ans = [] diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index d16233be1a..90abfc2474 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -351,6 +351,8 @@ def populate_metadata_page(layout, db, book_id, bulk=False, two_column=False, pa if not x[col]['editable']: continue dt = x[col]['datatype'] + if dt == 'composite': + continue if dt == 'comments': continue w = widget_factory(dt, col) diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 3d9c9ab2ee..1d6c84ef7c 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -6,7 +6,9 @@ __docformat__ = 'restructuredtext en' from PyQt4.Qt import QWidget, QListWidgetItem, Qt, QVariant, SIGNAL +from calibre.gui2 import error_dialog from calibre.gui2.device_drivers.configwidget_ui import Ui_ConfigWidget +from calibre.utils.formatter import validation_formatter class ConfigWidget(QWidget, Ui_ConfigWidget): @@ -77,3 +79,16 @@ class ConfigWidget(QWidget, Ui_ConfigWidget): def use_author_sort(self): return self.opt_use_author_sort.isChecked() + + def validate(self): + print 'here in validate' + tmpl = unicode(self.opt_save_template.text()) + try: + validation_formatter.validate(tmpl) + return True + except Exception, err: + error_dialog(self, _('Invalid template'), + '

'+_('The template %s is invalid:')%tmpl + \ + '
'+str(err), show=True) + + return False diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index bf233b1175..ceb1cf14a8 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -15,10 +15,11 @@ from PyQt4.Qt import QColor, Qt, QModelIndex, QSize, \ QStyledItemDelegate, QCompleter, \ QComboBox -from calibre.gui2 import UNDEFINED_QDATE +from calibre.gui2 import UNDEFINED_QDATE, error_dialog from calibre.gui2.widgets import EnLineEdit, TagsLineEdit from calibre.utils.date import now, format_date from calibre.utils.config import tweaks +from calibre.utils.formatter import validation_formatter from calibre.gui2.dialogs.comments_dialog import CommentsDialog class RatingDelegate(QStyledItemDelegate): # {{{ @@ -303,6 +304,31 @@ class CcBoolDelegate(QStyledItemDelegate): # {{{ val = 2 if val is None else 1 if not val else 0 editor.setCurrentIndex(val) +class CcTemplateDelegate(QStyledItemDelegate): # {{{ + def __init__(self, parent): + ''' + Delegate for custom_column bool data. + ''' + QStyledItemDelegate.__init__(self, parent) + + def createEditor(self, parent, option, index): + return EnLineEdit(parent) + + def setModelData(self, editor, model, index): + val = unicode(editor.text()) + try: + validation_formatter.validate(val) + except Exception, err: + error_dialog(self.parent(), _('Invalid template'), + '

'+_('The template %s is invalid:')%val + \ + '
'+str(err), show=True) + model.setData(index, QVariant(val), Qt.EditRole) + + def setEditorData(self, editor, index): + m = index.model() + val = m.custom_columns[m.column_map[index.column()]]['display']['composite_template'] + editor.setText(val) + # }}} diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 4b1e974b12..fe64a33c47 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -696,7 +696,8 @@ class BooksModel(QAbstractTableModel): # {{{ return flags def set_custom_column_data(self, row, colhead, value): - typ = self.custom_columns[colhead]['datatype'] + cc = self.custom_columns[colhead] + typ = cc['datatype'] label=self.db.field_metadata.key_to_label(colhead) s_index = None if typ in ('text', 'comments'): @@ -722,6 +723,14 @@ class BooksModel(QAbstractTableModel): # {{{ val = qt_to_dt(val, as_utc=False) elif typ == 'series': val, s_index = parse_series_string(self.db, label, value.toString()) + elif typ == 'composite': + tmpl = unicode(value.toString()).strip() + disp = cc['display'] + disp['composite_template'] = tmpl + self.db.set_custom_column_metadata(cc['colnum'], display = disp) + self.refresh(reset=True) + return True + self.db.set_custom(self.db.id(row), val, extra=s_index, label=label, num=None, append=False, notify=True) return True @@ -768,6 +777,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.db.set_pubdate(id, qt_to_dt(val, as_utc=False)) else: self.db.set(row, column, val) + self.refresh_rows([row], row) self.dataChanged.emit(index, index) return True diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index d3ead429cf..b113866ecc 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -13,7 +13,7 @@ from PyQt4.Qt import QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, \ from calibre.gui2.library.delegates import RatingDelegate, PubDateDelegate, \ TextDelegate, DateDelegate, TagsDelegate, CcTextDelegate, \ - CcBoolDelegate, CcCommentsDelegate, CcDateDelegate + CcBoolDelegate, CcCommentsDelegate, CcDateDelegate, CcTemplateDelegate from calibre.gui2.library.models import BooksModel, DeviceBooksModel from calibre.utils.config import tweaks, prefs from calibre.gui2 import error_dialog, gprefs @@ -47,6 +47,7 @@ class BooksView(QTableView): # {{{ self.cc_text_delegate = CcTextDelegate(self) self.cc_bool_delegate = CcBoolDelegate(self) self.cc_comments_delegate = CcCommentsDelegate(self) + self.cc_template_delegate = CcTemplateDelegate(self) self.display_parent = parent self._model = modelcls(self) self.setModel(self._model) @@ -392,8 +393,7 @@ class BooksView(QTableView): # {{{ elif cc['datatype'] == 'rating': self.setItemDelegateForColumn(cm.index(colhead), self.rating_delegate) elif cc['datatype'] == 'composite': - pass - # no delegate for composite columns, as they are not editable + self.setItemDelegateForColumn(cm.index(colhead), self.cc_template_delegate) else: dattr = colhead+'_delegate' delegate = colhead if hasattr(self, dattr) else 'text' diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py index 761a9880b1..c1b9230f42 100644 --- a/src/calibre/gui2/preferences/columns.py +++ b/src/calibre/gui2/preferences/columns.py @@ -155,8 +155,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): name=self.custcols[c]['name'], datatype=self.custcols[c]['datatype'], is_multiple=self.custcols[c]['is_multiple'], - display = self.custcols[c]['display'], - editable = self.custcols[c]['editable']) + display = self.custcols[c]['display']) must_restart = True elif '*deleteme' in self.custcols[c]: db.delete_custom_column(label=self.custcols[c]['label']) diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index e88949a23c..bec21270df 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -156,9 +156,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): return self.simple_error('', _('You must enter a template for' ' composite columns')) display_dict = {'composite_template':unicode(self.composite_box.text())} - is_editable = False - else: - is_editable = True db = self.parent.gui.library_view.model().db key = db.field_metadata.custom_field_prefix+col @@ -168,7 +165,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): 'label':col, 'name':col_heading, 'datatype':col_type, - 'editable':is_editable, 'display':display_dict, 'normalized':None, 'colnum':None, diff --git a/src/calibre/gui2/preferences/plugins.py b/src/calibre/gui2/preferences/plugins.py index a26553db1c..388227e438 100644 --- a/src/calibre/gui2/preferences/plugins.py +++ b/src/calibre/gui2/preferences/plugins.py @@ -199,7 +199,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): config_dialog.exec_() if config_dialog.result() == QDialog.Accepted: - plugin.save_settings(config_widget) + if hasattr(config_widget, 'validate'): + if config_widget.validate(): + plugin.save_settings(config_widget) + else: + plugin.save_settings(config_widget) self._plugin_model.refresh_plugin(plugin) else: help_text = plugin.customization_help(gui=True) diff --git a/src/calibre/gui2/preferences/save_template.py b/src/calibre/gui2/preferences/save_template.py index 0f48893b69..5b3f0321b2 100644 --- a/src/calibre/gui2/preferences/save_template.py +++ b/src/calibre/gui2/preferences/save_template.py @@ -13,17 +13,8 @@ from PyQt4.Qt import QWidget, pyqtSignal from calibre.gui2 import error_dialog from calibre.gui2.preferences.save_template_ui import Ui_Form from calibre.library.save_to_disk import FORMAT_ARG_DESCS, preprocess_template +from calibre.utils.formatter import validation_formatter -class ValidateFormat(string.Formatter): - ''' - Provides a format function that substitutes '' for any missing value - ''' - def get_value(self, key, args, kwargs): - return 'this is some text that should be long enough' - -validate_formatter = ValidateFormat() -def validate_format(x, format_args): - return validate_formatter.vformat(x, [], format_args).strip() class SaveTemplate(QWidget, Ui_Form): @@ -62,9 +53,8 @@ class SaveTemplate(QWidget, Ui_Form): custom fields, because they may or may not exist. ''' tmpl = preprocess_template(self.opt_template.text()) - fa = {} try: - validate_format(tmpl, fa) + validation_formatter.validate(tmpl) except Exception, err: error_dialog(self, _('Invalid template'), '

'+_('The template %s is invalid:')%tmpl + \ diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 42feb6f8fa..7849eecb2e 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -546,7 +546,7 @@ class ResultCache(SearchQueryParser): if len(self.composites) > 0: mi = db.get_metadata(id, index_is_id=True) for k,c in self.composites: - self._data[id][c] = mi.format_field(k)[1] + self._data[id][c] = mi.get(k, None) except IndexError: return None try: diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 90e5413389..a0f739e4c2 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -9,6 +9,7 @@ __docformat__ = 'restructuredtext en' import os, traceback, cStringIO, re, string from calibre.utils.config import Config, StringConfig, tweaks +from calibre.utils.formatter import TemplateFormatter from calibre.utils.filenames import shorten_components_to, supports_long_names, \ ascii_filename, sanitize_file_name from calibre.ebooks.metadata.opf2 import metadata_to_opf @@ -101,40 +102,20 @@ def preprocess_template(template): template = template.decode(preferred_encoding, 'replace') return template -template_value_re = re.compile(r'^([^\|]*(?=\|))(?:\|?)([^\|]*)(?:\|?)((?<=\|).*?)$', - flags= re.UNICODE) - -def explode_string_template_value(key): - try: - matches = template_value_re.match(key) - if matches.lastindex != 3: - return key - return matches.groups() - except: - return '', key, '' - -class SafeFormat(string.Formatter): +class SafeFormat(TemplateFormatter): ''' Provides a format function that substitutes '' for any missing value ''' def get_value(self, key, args, kwargs): try: - prefix, key, suffix = explode_string_template_value(key) if kwargs[key]: - return prefix + unicode(kwargs[key]) + suffix + return kwargs[key] return '' except: return '' safe_formatter = SafeFormat() -def safe_format(x, format_args): - try: - ans = safe_formatter.vformat(x, [], format_args).strip() - except: - ans = '' - return re.sub(r'\s+', ' ', ans) - def get_components(template, mi, id, timefmt='%b %Y', length=250, sanitize_func=ascii_filename, replace_whitespace=False, to_lowercase=False): @@ -178,8 +159,8 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, elif custom_metadata[key]['datatype'] == 'bool': format_args[key] = _('yes') if format_args[key] else _('no') - components = [x.strip() for x in template.split('/') if x.strip()] - components = [safe_format(x, format_args) for x in components] + components = safe_formatter.safe_format(template, format_args, '') + components = [x.strip() for x in components.split('/') if x.strip()] components = [sanitize_func(x) for x in components if x] if not components: components = [str(id)] diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py new file mode 100644 index 0000000000..f9ef4e0846 --- /dev/null +++ b/src/calibre/utils/formatter.py @@ -0,0 +1,113 @@ +''' +Created on 23 Sep 2010 + +@author: charles +''' + +import re, string + +def _lookup(val, mi, field_if_set, field_not_set): + if hasattr(mi, 'format_field'): + if val: + return mi.format_field(field_if_set.strip())[1] + else: + return mi.format_field(field_not_set.strip())[1] + else: + if val: + return mi.get(field_if_set.strip(), '') + else: + return mi.get(field_not_set.strip(), '') + +def _ifempty(val, mi, value_if_empty): + if val: + return val + else: + return value_if_empty + +def _shorten(val, mi, leading, center_string, trailing): + l = int(leading) + t = int(trailing) + if len(val) > l + len(center_string) + t: + return val[0:l] + center_string + val[-t:] + else: + return val + +class TemplateFormatter(string.Formatter): + ''' + Provides a format function that substitutes '' for any missing value + ''' + + functions = { + 'uppercase' : (0, lambda x: x.upper()), + 'lowercase' : (0, lambda x: x.lower()), + 'titlecase' : (0, lambda x: x.title()), + 'capitalize' : (0, lambda x: x.capitalize()), + 'ifempty' : (1, _ifempty), + 'lookup' : (2, _lookup), + 'shorten' : (3, _shorten), + } + + def get_value(self, key, args, mi): + raise Exception('get_value must be implemented in the subclass') + + format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$') + + def _explode_format_string(self, fmt): + try: + matches = self.format_string_re.match(fmt) + if matches is None or matches.lastindex != 3: + return fmt, '', '' + return matches.groups() + except: + import traceback + traceback.print_exc() + return fmt, '', '' + + def format_field(self, val, fmt): + fmt, prefix, suffix = self._explode_format_string(fmt) + + p = fmt.find('(') + if p >= 0 and fmt[-1] == ')' and fmt[0:p] in self.functions: + field = fmt[0:p] + func = self.functions[field] + args = fmt[p+1:-1].split(',') + if (func[0] == 0 and (len(args) != 1 or args[0])) or \ + (func[0] > 0 and func[0] != len(args)): + raise Exception ('Incorrect number of arguments for function '+ fmt[0:p]) + if func[0] == 0: + val = func[1](val, self.mi) + else: + val = func[1](val, self.mi, *args) + else: + val = string.Formatter.format_field(self, val, fmt) + if not val: + return '' + return prefix + val + suffix + + compress_spaces = re.compile(r'\s+') + + def vformat(self, fmt, args, kwargs): + self.mi = kwargs + ans = string.Formatter.vformat(self, fmt, args, kwargs) + return self.compress_spaces.sub(' ', ans).strip() + + def safe_format(self, fmt, kwargs, error_value): + try: + ans = self.vformat(fmt, [], kwargs).strip() + except: + ans = error_value + return ans + +class ValidateFormat(TemplateFormatter): + ''' + Provides a format function that substitutes '' for any missing value + ''' + def get_value(self, key, args, kwargs): + return 'this is some text that should be long enough' + + def validate(self, x): + return self.vformat(x, [], {}) + +validation_formatter = ValidateFormat() + + From 30c96df50546e9730ad1903ac31e54a05d09f723 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Sep 2010 08:13:51 -0600 Subject: [PATCH 094/235] ... --- src/calibre/utils/pyconsole/history.py | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/calibre/utils/pyconsole/history.py diff --git a/src/calibre/utils/pyconsole/history.py b/src/calibre/utils/pyconsole/history.py new file mode 100644 index 0000000000..5440e57153 --- /dev/null +++ b/src/calibre/utils/pyconsole/history.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from collections import deque + +class History(object): # {{{ + + def __init__(self, current, entries): + self.entries = deque(entries, maxlen=max(2000, len(entries))) + self.index = len(self.entries) - 1 + self.current = self.default = current + self.last_was_back = False + + def back(self, amt=1): + if self.entries: + oidx = self.index + ans = self.entries[self.index] + self.index = max(0, self.index - amt) + self.last_was_back = self.index != oidx + return ans + + def forward(self, amt=1): + if self.entries: + d = self.index + if self.last_was_back: + d += 1 + if d >= len(self.entries) - 1: + self.index = len(self.entries) - 1 + self.last_was_back = False + return self.current + if self.last_was_back: + amt += 1 + self.index = min(len(self.entries)-1, self.index + amt) + self.last_was_back = False + return self.entries[self.index] + + def enter(self, x): + try: + self.entries.remove(x) + except ValueError: + pass + self.entries.append(x) + self.index = len(self.entries) - 1 + self.current = self.default + self.last_was_back = False + + def serialize(self): + return list(self.entries) + +# }}} + + From 36ce8740816958c064a10334df0cb50e36f4784c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 23 Sep 2010 17:18:49 +0100 Subject: [PATCH 095/235] Fix db2.get_metadata to handle format correctly (it is already a list) Fix Metadata to put composite fields back where they belong --- src/calibre/ebooks/metadata/book/base.py | 2 +- src/calibre/library/database2.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 16819cbd39..2bbe76488e 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -99,7 +99,7 @@ class Metadata(object): continue cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field cf['#value#'] = composite_formatter.safe_format( - d['display']['composite_template'], + cf['display']['composite_template'], self, _('TEMPLATE ERROR')).strip() return d['#value#'] diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index fd5809f937..fde57e2a2e 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -584,9 +584,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) mi.formats = self.formats(idx, index_is_id=index_is_id, verify_formats=False) - if hasattr(mi.formats, 'split'): - mi.formats = mi.formats.split(',') - else: + if len(mi.formats) == 0: mi.formats = None tags = self.tags(idx, index_is_id=index_is_id) if tags: From b2d5f740b5268d369941e337c78c5838060caa98 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 23 Sep 2010 17:46:46 +0100 Subject: [PATCH 096/235] 1) Put back get_metadata code for format, and fix format. 2) Ensure that gui editing does an lcase. --- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/database2.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index fe64a33c47..bab2a59b1c 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -724,7 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{ elif typ == 'series': val, s_index = parse_series_string(self.db, label, value.toString()) elif typ == 'composite': - tmpl = unicode(value.toString()).strip() + tmpl = unicode(value.toString()).lower().strip() disp = cc['display'] disp['composite_template'] = tmpl self.db.set_custom_column_metadata(cc['colnum'], display = disp) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index fde57e2a2e..22de8df41f 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -584,7 +584,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) mi.formats = self.formats(idx, index_is_id=index_is_id, verify_formats=False) - if len(mi.formats) == 0: + if hasattr(mi.formats, 'split'): + mi.formats = mi.formats.split(',') + else: mi.formats = None tags = self.tags(idx, index_is_id=index_is_id) if tags: @@ -731,7 +733,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): except: return None if not verify_formats: - return formats + return ','.join(formats) ans = [] for format in formats: if self.format_abspath(id, format, index_is_id=True) is not None: From 232ce4748ddcf03fc21007cc3a1d5ea72e01ce64 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 23 Sep 2010 17:59:50 +0100 Subject: [PATCH 097/235] Back out the models 'strip' change --- src/calibre/ebooks/metadata/book/base.py | 2 +- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/save_to_disk.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 2bbe76488e..9e1085df25 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -36,7 +36,7 @@ field_metadata = FieldMetadata() class SafeFormat(TemplateFormatter): def get_value(self, key, args, mi): try: - ign, v = mi.format_field(key, series_with_index=False) + ign, v = mi.format_field(key.lower(), series_with_index=False) if v is None: return '' if v == '': diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index bab2a59b1c..fe64a33c47 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -724,7 +724,7 @@ class BooksModel(QAbstractTableModel): # {{{ elif typ == 'series': val, s_index = parse_series_string(self.db, label, value.toString()) elif typ == 'composite': - tmpl = unicode(value.toString()).lower().strip() + tmpl = unicode(value.toString()).strip() disp = cc['display'] disp['composite_template'] = tmpl self.db.set_custom_column_metadata(cc['colnum'], display = disp) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index a0f739e4c2..11922b7154 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -108,8 +108,8 @@ class SafeFormat(TemplateFormatter): ''' def get_value(self, key, args, kwargs): try: - if kwargs[key]: - return kwargs[key] + if kwargs[key.lower()]: + return kwargs[key.lower()] return '' except: return '' From 1a782eb0ffa9ca7bfc063902b35b06f6e8399271 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 23 Sep 2010 20:36:52 +0100 Subject: [PATCH 098/235] - Some cleanups on templates. - Make save_to_disk templates sanitize all fields except composites --- src/calibre/ebooks/metadata/book/base.py | 9 ++- src/calibre/library/save_to_disk.py | 12 ++-- src/calibre/utils/formatter.py | 72 ++++++++++++------------ 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 9e1085df25..929dc01aec 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -34,9 +34,10 @@ NULL_VALUES = { field_metadata = FieldMetadata() class SafeFormat(TemplateFormatter): - def get_value(self, key, args, mi): + + def get_value(self, key, args, kwargs): try: - ign, v = mi.format_field(key.lower(), series_with_index=False) + ign, v = self.book.format_field(key.lower(), series_with_index=False) if v is None: return '' if v == '': @@ -100,7 +101,9 @@ class Metadata(object): cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field cf['#value#'] = composite_formatter.safe_format( cf['display']['composite_template'], - self, _('TEMPLATE ERROR')).strip() + self, + _('TEMPLATE ERROR'), + self).strip() return d['#value#'] raise AttributeError( diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 11922b7154..2d0a3d1277 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -108,8 +108,12 @@ class SafeFormat(TemplateFormatter): ''' def get_value(self, key, args, kwargs): try: - if kwargs[key.lower()]: - return kwargs[key.lower()] + b = self.book.get_user_metadata(key, False) + key = key.lower() + if b is not None and b['datatype'] == 'composite': + return self.vformat(b['display']['composite_template'], [], kwargs) + if kwargs[key]: + return self.sanitize(kwargs[key.lower()]) return '' except: return '' @@ -159,9 +163,9 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, elif custom_metadata[key]['datatype'] == 'bool': format_args[key] = _('yes') if format_args[key] else _('no') - components = safe_formatter.safe_format(template, format_args, '') + components = safe_formatter.safe_format(template, format_args, '', mi, + sanitize=sanitize_func) components = [x.strip() for x in components.split('/') if x.strip()] - components = [sanitize_func(x) for x in components if x] if not components: components = [str(id)] components = [x.encode(filesystem_encoding, 'replace') if isinstance(x, diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index f9ef4e0846..95870d9c61 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -6,48 +6,48 @@ Created on 23 Sep 2010 import re, string -def _lookup(val, mi, field_if_set, field_not_set): - if hasattr(mi, 'format_field'): - if val: - return mi.format_field(field_if_set.strip())[1] - else: - return mi.format_field(field_not_set.strip())[1] - else: - if val: - return mi.get(field_if_set.strip(), '') - else: - return mi.get(field_not_set.strip(), '') - -def _ifempty(val, mi, value_if_empty): - if val: - return val - else: - return value_if_empty - -def _shorten(val, mi, leading, center_string, trailing): - l = int(leading) - t = int(trailing) - if len(val) > l + len(center_string) + t: - return val[0:l] + center_string + val[-t:] - else: - return val - class TemplateFormatter(string.Formatter): ''' Provides a format function that substitutes '' for any missing value ''' + def __init__(self): + string.Formatter.__init__(self) + self.book = None + self.kwargs = None + self.sanitize = None + + def _lookup(self, val, field_if_set, field_not_set): + if val: + return self.vformat('{'+field_if_set.strip()+'}', [], self.kwargs) + else: + return self.vformat('{'+field_not_set.strip()+'}', [], self.kwargs) + + def _ifempty(self, val, value_if_empty): + if val: + return val + else: + return value_if_empty + + def _shorten(self, val, leading, center_string, trailing): + l = int(leading) + t = int(trailing) + if len(val) > l + len(center_string) + t: + return val[0:l] + center_string + val[-t:] + else: + return val + functions = { - 'uppercase' : (0, lambda x: x.upper()), - 'lowercase' : (0, lambda x: x.lower()), - 'titlecase' : (0, lambda x: x.title()), - 'capitalize' : (0, lambda x: x.capitalize()), + 'uppercase' : (0, lambda s,x: x.upper()), + 'lowercase' : (0, lambda s,x: x.lower()), + 'titlecase' : (0, lambda s,x: x.title()), + 'capitalize' : (0, lambda s,x: x.capitalize()), 'ifempty' : (1, _ifempty), 'lookup' : (2, _lookup), 'shorten' : (3, _shorten), } - def get_value(self, key, args, mi): + def get_value(self, key, args): raise Exception('get_value must be implemented in the subclass') format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$') @@ -75,9 +75,9 @@ class TemplateFormatter(string.Formatter): (func[0] > 0 and func[0] != len(args)): raise Exception ('Incorrect number of arguments for function '+ fmt[0:p]) if func[0] == 0: - val = func[1](val, self.mi) + val = func[1](self, val) else: - val = func[1](val, self.mi, *args) + val = func[1](self, val, *args) else: val = string.Formatter.format_field(self, val, fmt) if not val: @@ -87,11 +87,13 @@ class TemplateFormatter(string.Formatter): compress_spaces = re.compile(r'\s+') def vformat(self, fmt, args, kwargs): - self.mi = kwargs ans = string.Formatter.vformat(self, fmt, args, kwargs) return self.compress_spaces.sub(' ', ans).strip() - def safe_format(self, fmt, kwargs, error_value): + def safe_format(self, fmt, kwargs, error_value, book, sanitize=None): + self.kwargs = kwargs + self.book = book + self.sanitize = sanitize try: ans = self.vformat(fmt, [], kwargs).strip() except: From 1ad0eebd5658c73913dc0ef4b73a95ae0c8960a5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Sep 2010 23:30:16 -0600 Subject: [PATCH 099/235] API for dealing with distributed metadata backup --- src/calibre/library/custom_columns.py | 5 ++- src/calibre/library/database2.py | 47 +++++++++++++++++++++++++- src/calibre/library/schema_upgrades.py | 12 +++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index d74024280e..2d8634659b 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -382,6 +382,7 @@ class CustomColumns(object): ) # get rid of the temp tables self.conn.executescript(drops) + self.dirtied(ids, commit=False) self.conn.commit() # set the in-memory copies of the tags @@ -402,19 +403,21 @@ class CustomColumns(object): same length as ids. ''' if extras is not None and len(extras) != len(ids): - raise ValueError('Lentgh of ids and extras is not the same') + raise ValueError('Length of ids and extras is not the same') ev = None for idx,id in enumerate(ids): if extras is not None: ev = extras[idx] self._set_custom(id, val, label=label, num=num, append=append, notify=notify, extra=ev) + self.dirtied(ids, commit=False) self.conn.commit() def set_custom(self, id, val, label=None, num=None, append=False, notify=True, extra=None, commit=True): self._set_custom(id, val, label=label, num=num, append=append, notify=notify, extra=extra) + self.dirtied([id], commit=False) if commit: self.conn.commit() diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 1fe77077b9..7a8aef541d 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -13,6 +13,7 @@ from math import floor from PyQt4.QtGui import QImage from calibre.ebooks.metadata import title_sort, author_to_author_sort +from calibre.ebooks.metadata.opf2 import metadata_to_opf from calibre.library.database import LibraryDatabase from calibre.library.field_metadata import FieldMetadata, TagsIcons from calibre.library.schema_upgrades import SchemaUpgrade @@ -126,6 +127,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def __init__(self, library_path, row_factory=False): self.field_metadata = FieldMetadata() + self.dirtied_cache = set([]) if not os.path.exists(library_path): os.makedirs(library_path) self.listeners = set([]) @@ -337,6 +339,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): setattr(self, 'title_sort', functools.partial(self.get_property, loc=self.FIELD_MAP['sort'])) + d = self.conn.get('SELECT book FROM metadata_dirtied', all=True) + self.dirtied_cache.update(set([x[0] for x in d])) + self.refresh_ondevice = functools.partial(self.data.refresh_ondevice, self) self.refresh() self.last_update_check = self.last_modified() @@ -550,6 +555,33 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def metadata_for_field(self, key): return self.field_metadata[key] + def dump_metadata(self, book_ids, remove_from_dirtied=True, commit=True): + for book_id in book_ids: + mi = self.get_metadata(book_id, index_is_id=True, get_cover=True) + # Always set cover to cover.jpg. Even if cover doesn't exist, + # no harm done. This way no need to call dirtied when + # cover is set/removed + mi.cover = 'cover.jpg' + raw = metadata_to_opf(mi) + path = self.abspath(book_id, index_is_id=True) + with open(os.path.join(path, 'metadata.opf'), 'wb') as f: + f.write(raw) + if remove_from_dirtied: + self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', + (book_id,)) + if book_id in self.dirtied_cache: + self.dirtied_cache.remove(book_id) + if commit: + self.conn.commit() + + def dirtied(self, book_ids, commit=True): + self.conn.executemany( + 'INSERT OR REPLACE INTO metadata_dirtied VALUES (?)', + [(x,) for x in book_ids]) + if commit: + self.conn.commit() + self.dirtied.update(set(book_ids)) + def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' Convenience method to return metadata as a :class:`Metadata` object. @@ -583,7 +615,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.uuid = self.uuid(idx, index_is_id=index_is_id) mi.title_sort = self.title_sort(idx, index_is_id=index_is_id) mi.formats = self.formats(idx, index_is_id=index_is_id, - verify_formats=False) + verify_formats=False) if hasattr(mi.formats, 'split'): mi.formats = mi.formats.split(',') else: @@ -1242,6 +1274,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): ss = self.author_sort_from_book(id, index_is_id=True) self.conn.execute('UPDATE books SET author_sort=? WHERE id=?', (ss, id)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['authors'], @@ -1268,6 +1301,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): else: self.data.set(id, self.FIELD_MAP['sort'], title, row_is_id=True) self.set_path(id, index_is_id=True) + self.dirtied([id], commit=False) if commit: self.conn.commit() if notify: @@ -1277,6 +1311,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if dt: self.conn.execute('UPDATE books SET timestamp=? WHERE id=?', (dt, id)) self.data.set(id, self.FIELD_MAP['timestamp'], dt, row_is_id=True) + self.dirtied([id], commit=False) if commit: self.conn.commit() if notify: @@ -1286,6 +1321,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if dt: self.conn.execute('UPDATE books SET pubdate=? WHERE id=?', (dt, id)) self.data.set(id, self.FIELD_MAP['pubdate'], dt, row_is_id=True) + self.dirtied([id], commit=False) if commit: self.conn.commit() if notify: @@ -1304,6 +1340,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): else: aid = self.conn.execute('INSERT INTO publishers(name) VALUES (?)', (publisher,)).lastrowid self.conn.execute('INSERT INTO books_publishers_link(book, publisher) VALUES (?,?)', (id, aid)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['publisher'], publisher, row_is_id=True) @@ -1594,6 +1631,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): '''.format(tables[0], tables[1]) ) self.conn.executescript(drops) + self.dirtied(ids, commit=False) self.conn.commit() for x in ids: @@ -1639,6 +1677,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): (id, tid), all=False): self.conn.execute('INSERT INTO books_tags_link(book, tag) VALUES (?,?)', (id, tid)) + self.dirtied([id], commit=False) if commit: self.conn.commit() tags = u','.join(self.get_tags(id)) @@ -1693,6 +1732,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): else: aid = self.conn.execute('INSERT INTO series(name) VALUES (?)', (series,)).lastrowid self.conn.execute('INSERT INTO books_series_link(book, series) VALUES (?,?)', (id, aid)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['series'], series, row_is_id=True) @@ -1707,6 +1747,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): except: idx = 1.0 self.conn.execute('UPDATE books SET series_index=? WHERE id=?', (idx, id)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['series_index'], idx, row_is_id=True) @@ -1719,6 +1760,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): rat = self.conn.get('SELECT id FROM ratings WHERE rating=?', (rating,), all=False) rat = rat if rat else self.conn.execute('INSERT INTO ratings(rating) VALUES (?)', (rating,)).lastrowid self.conn.execute('INSERT INTO books_ratings_link(book, rating) VALUES (?,?)', (id, rat)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['rating'], rating, row_is_id=True) @@ -1731,11 +1773,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['comments'], text, row_is_id=True) + self.dirtied([id], commit=False) if notify: self.notify('metadata', [id]) def set_author_sort(self, id, sort, notify=True, commit=True): self.conn.execute('UPDATE books SET author_sort=? WHERE id=?', (sort, id)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['author_sort'], sort, row_is_id=True) @@ -1744,6 +1788,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def set_isbn(self, id, isbn, notify=True, commit=True): self.conn.execute('UPDATE books SET isbn=? WHERE id=?', (isbn, id)) + self.dirtied([id], commit=False) if commit: self.conn.commit() self.data.set(id, self.FIELD_MAP['isbn'], isbn, row_is_id=True) diff --git a/src/calibre/library/schema_upgrades.py b/src/calibre/library/schema_upgrades.py index b08161abf2..167cc0a327 100644 --- a/src/calibre/library/schema_upgrades.py +++ b/src/calibre/library/schema_upgrades.py @@ -397,3 +397,15 @@ class SchemaUpgrade(object): UNIQUE(key)); ''' self.conn.executescript(script) + + def upgrade_version_13(self): + 'Dirtied table for OPF metadata backups' + script = ''' + DROP TABLE IF EXISTS metadata_dirtied; + CREATE TABLE metadata_dirtied(id INTEGER PRIMARY KEY, + book INTEGER NOT NULL, + UNIQUE(book)); + INSERT INTO metadata_dirtied (book) SELECT id FROM books; + ''' + self.conn.executescript(script) + From f46d919c751dbccb24f21c348ca130833ffc5a7a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Sep 2010 23:50:22 -0600 Subject: [PATCH 100/235] Add thread to GUI for distributed metadata backup --- src/calibre/gui2/library/models.py | 5 ++++- src/calibre/gui2/ui.py | 4 ++++ src/calibre/library/caches.py | 30 ++++++++++++++++++++++++++++-- src/calibre/library/database2.py | 15 +++++++++------ 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index fe64a33c47..9d9de358c8 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -21,7 +21,7 @@ from calibre.utils.date import dt_factory, qt_to_dt, isoformat from calibre.ebooks.metadata.meta import set_metadata as _set_metadata from calibre.utils.search_query_parser import SearchQueryParser from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \ - REGEXP_MATCH, CoverCache + REGEXP_MATCH, CoverCache, MetadataBackup from calibre.library.cli import parse_series_string from calibre import strftime, isbytestring, prepare_string_for_xml from calibre.constants import filesystem_encoding @@ -153,6 +153,9 @@ class BooksModel(QAbstractTableModel): # {{{ self.cover_cache.stop() self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() + self.metadata_backup = MetadataBackup(db, + FunctionDispatcher(self.db.dump_metadata)) + self.metadata_backup.start() def refresh_cover(event, ids): if event == 'cover' and self.cover_cache is not None: self.cover_cache.refresh(ids) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 9bc504a001..88a8c68572 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -551,6 +551,10 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ cc = self.library_view.model().cover_cache if cc is not None: cc.stop() + mb = self.library_view.model().metadata_backup + if mb is not None: + mb.stop() + self.hide_windows() self.emailer.stop() try: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 7849eecb2e..2d37314896 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -21,7 +21,31 @@ from calibre.utils.pyparsing import ParseException from calibre.ebooks.metadata import title_sort from calibre import fit_image -class CoverCache(Thread): +class MetadataBackup(Thread): # {{{ + + def __init__(self, db, dump_func): + Thread.__init__(self) + self.daemon = True + self.db = db + self.dump_func = dump_func + self.keep_running = True + + def stop(self): + self.keep_running = False + + def run(self): + while self.keep_running: + try: + id_ = self.db.dirtied_queue.get(True, 5) + except Empty: + continue + # If there is an exception is dump_func, we + # have no way of knowing + self.dump_func([id_]) + +# }}} + +class CoverCache(Thread): # {{{ def __init__(self, db, cover_func): Thread.__init__(self) @@ -90,6 +114,7 @@ class CoverCache(Thread): for id_ in ids: self.cache.pop(id_, None) self.load_queue.put(id_) +# }}} ### Global utility function for get_match here and in gui2/library.py CONTAINS_MATCH = 0 @@ -107,7 +132,7 @@ def _match(query, value, matchkind): pass return False -class ResultCache(SearchQueryParser): +class ResultCache(SearchQueryParser): # {{{ ''' Stores sorted and filtered metadata in memory. @@ -694,4 +719,5 @@ class SortKeyGenerator(object): # }}} +# }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 7a8aef541d..92f8cca0db 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -9,6 +9,7 @@ The database used to store ebook metadata import os, sys, shutil, cStringIO, glob, time, functools, traceback, re from itertools import repeat from math import floor +from Queue import Queue from PyQt4.QtGui import QImage @@ -127,7 +128,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def __init__(self, library_path, row_factory=False): self.field_metadata = FieldMetadata() - self.dirtied_cache = set([]) + self.dirtied_queue = Queue() if not os.path.exists(library_path): os.makedirs(library_path) self.listeners = set([]) @@ -340,7 +341,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): loc=self.FIELD_MAP['sort'])) d = self.conn.get('SELECT book FROM metadata_dirtied', all=True) - self.dirtied_cache.update(set([x[0] for x in d])) + for x in d: + self.dirtied_queue.put(x[0]) self.refresh_ondevice = functools.partial(self.data.refresh_ondevice, self) self.refresh() @@ -557,6 +559,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def dump_metadata(self, book_ids, remove_from_dirtied=True, commit=True): for book_id in book_ids: + if not self.data.has_id(book_id): + continue mi = self.get_metadata(book_id, index_is_id=True, get_cover=True) # Always set cover to cover.jpg. Even if cover doesn't exist, # no harm done. This way no need to call dirtied when @@ -569,18 +573,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if remove_from_dirtied: self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,)) - if book_id in self.dirtied_cache: - self.dirtied_cache.remove(book_id) if commit: self.conn.commit() def dirtied(self, book_ids, commit=True): self.conn.executemany( - 'INSERT OR REPLACE INTO metadata_dirtied VALUES (?)', + 'INSERT OR REPLACE INTO metadata_dirtied (book) VALUES (?)', [(x,) for x in book_ids]) if commit: self.conn.commit() - self.dirtied.update(set(book_ids)) + for x in book_ids: + self.dirtied_queue.put(x) def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' From 703ea3c77827a4053d4c020fa79e7d5e8111f24a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Sep 2010 23:55:56 -0600 Subject: [PATCH 101/235] propert indentation in generated OPF files --- src/calibre/ebooks/metadata/opf2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 8a4ff6a5bd..5c2477c3dc 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -1230,7 +1230,7 @@ def metadata_to_opf(mi, as_string=True): %(id)s %(uuid)s - + '''%dict(a=__appname__, id=mi.application_id, uuid=mi.uuid))) From 87d70304bd7c96b3f65c565b1d8f8177f017f7a0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 00:05:11 -0600 Subject: [PATCH 102/235] Make metadata backup a little more robust --- src/calibre/library/caches.py | 14 ++++++++++---- src/calibre/library/database2.py | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 2d37314896..0b5a922209 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -19,7 +19,7 @@ from calibre.utils.date import parse_date, now, UNDEFINED_DATE from calibre.utils.search_query_parser import SearchQueryParser from calibre.utils.pyparsing import ParseException from calibre.ebooks.metadata import title_sort -from calibre import fit_image +from calibre import fit_image, prints class MetadataBackup(Thread): # {{{ @@ -39,9 +39,15 @@ class MetadataBackup(Thread): # {{{ id_ = self.db.dirtied_queue.get(True, 5) except Empty: continue - # If there is an exception is dump_func, we - # have no way of knowing - self.dump_func([id_]) + except: + # Happens during interpreter shutdown + break + if self.dump_func([id_]) is None: + # An exception occured in dump_func, retry once + prints('Failed to backup metadata for id:', id_, 'once') + time.sleep(2) + if not self.dump_func([id_]): + prints('Failed to backup metadata for id:', id_, 'again, giving up') # }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 92f8cca0db..6a0d442927 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -575,6 +575,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): (book_id,)) if commit: self.conn.commit() + return True def dirtied(self, book_ids, commit=True): self.conn.executemany( From 992e5c3c087c1e28cb1e5f1aa61ead0e4556de18 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 08:21:10 +0100 Subject: [PATCH 103/235] Repair damage during conflict resolution --- src/calibre/utils/formatter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index f1c2a2cb4d..a98f0e7f45 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -50,7 +50,7 @@ class TemplateFormatter(string.Formatter): format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$') compress_spaces = re.compile(r'\s+') - def get_value(self, key, args): + def get_value(self, key, args, kwargs): raise Exception('get_value must be implemented in the subclass') From 12768864a59be5ddf477c490072fd682b1f5942a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 08:54:06 +0100 Subject: [PATCH 104/235] 1) fix exception in set_metadata related to composite custom columns 2) make ondevice work with add_books_from_device --- src/calibre/gui2/actions/add.py | 2 +- src/calibre/gui2/device.py | 16 +++++++++------- src/calibre/gui2/library/models.py | 3 +++ src/calibre/library/custom_columns.py | 2 ++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index aa20b8bc16..e0a7b5647e 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -232,7 +232,7 @@ class AddAction(InterfaceAction): # metadata for this book to the device. This sets the uuid to the # correct value. Note that set_books_in_library might sync_booklists self.gui.set_books_in_library(booklists=[model.db], reset=True) - model.reset() + self.gui.refresh_ondevice() def add_books_from_device(self, view): rows = view.selectionModel().selectedRows() diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index a7e55c4619..58c5e5d9ad 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -721,14 +721,16 @@ class DeviceMixin(object): # {{{ self.device_manager.device.__class__.get_gui_name()+\ _(' detected.'), 3000) self.device_connected = device_kind - self.refresh_ondevice_info (device_connected = True, reset_only = True) + self.library_view.set_device_connected(self.device_connected) + self.refresh_ondevice (reset_only = True) else: self.device_connected = None self.status_bar.device_disconnected() if self.current_view() != self.library_view: self.book_details.reset_info() self.location_manager.update_devices() - self.refresh_ondevice_info(device_connected=False) + self.library_view.set_device_connected(self.device_connected) + self.refresh_ondevice() def info_read(self, job): ''' @@ -760,9 +762,9 @@ class DeviceMixin(object): # {{{ self.card_b_view.set_editable(self.device_manager.device.CAN_SET_METADATA) self.sync_news() self.sync_catalogs() - self.refresh_ondevice_info(device_connected = True) + self.refresh_ondevice() - def refresh_ondevice_info(self, device_connected, reset_only = False): + def refresh_ondevice(self, reset_only = False): ''' Force the library view to refresh, taking into consideration new device books information @@ -770,7 +772,7 @@ class DeviceMixin(object): # {{{ self.book_on_device(None, reset=True) if reset_only: return - self.library_view.set_device_connected(device_connected) + self.library_view.model().refresh_ondevice() # }}} @@ -803,7 +805,7 @@ class DeviceMixin(object): # {{{ self.book_on_device(None, reset=True) # We need to reset the ondevice flags in the library. Use a big hammer, # so we don't need to worry about whether some succeeded or not. - self.refresh_ondevice_info(device_connected=True, reset_only=False) + self.refresh_ondevice(reset_only=False) def dispatch_sync_event(self, dest, delete, specific): rows = self.library_view.selectionModel().selectedRows() @@ -1300,7 +1302,7 @@ class DeviceMixin(object): # {{{ if not self.set_books_in_library(self.booklists(), reset=True): self.upload_booklists() self.book_on_device(None, reset=True) - self.refresh_ondevice_info(device_connected = True) + self.refresh_ondevice() view = self.card_a_view if on_card == 'carda' else \ self.card_b_view if on_card == 'cardb' else self.memory_view diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 9d9de358c8..640a588d29 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -120,6 +120,9 @@ class BooksModel(QAbstractTableModel): # {{{ def set_device_connected(self, is_connected): self.device_connected = is_connected + self.refresh_ondevice() + + def refresh_ondevice(self): self.db.refresh_ondevice() self.refresh() # does a resort() self.research() diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index 2d8634659b..97c8565177 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -427,6 +427,8 @@ class CustomColumns(object): data = self.custom_column_label_map[label] if num is not None: data = self.custom_column_num_map[num] + if data['datatype'] == 'composite': + return None if not data['editable']: raise ValueError('Column %r is not editable'%data['label']) table, lt = self.custom_table_names(data['num']) From 97e2c838d0e6e4920ce4e1f4d71688979f57b68d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 10:50:50 +0100 Subject: [PATCH 105/235] 1) Fix of json codec. 2) make dump_metadata set get_cover=False --- src/calibre/ebooks/metadata/book/json_codec.py | 3 ++- src/calibre/library/database2.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 2550089473..c02d4e953d 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -75,7 +75,8 @@ class JsonCodec(object): self.field_metadata = FieldMetadata() def encode_to_file(self, file, booklist): - json.dump(self.encode_booklist_metadata(booklist), file, indent=2, encoding='utf-8') + file.write(json.dumps(self.encode_booklist_metadata(booklist), + indent=2, encoding='utf-8')) def encode_booklist_metadata(self, booklist): result = [] diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 6a0d442927..773a4bdc9f 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -561,7 +561,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): for book_id in book_ids: if not self.data.has_id(book_id): continue - mi = self.get_metadata(book_id, index_is_id=True, get_cover=True) + mi = self.get_metadata(book_id, index_is_id=True, get_cover=False) # Always set cover to cover.jpg. Even if cover doesn't exist, # no harm done. This way no need to call dirtied when # cover is set/removed From 8b9b64a8e6bdab03f62c98a4f2c35ec73957cca7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 11:34:52 +0100 Subject: [PATCH 106/235] 1) add two tweaks controlling what custom fields the content server displays 2) add & cleanup some field_metadata methods --- resources/default_tweaks.py | 18 ++++++++++++++++++ src/calibre/gui2/library/models.py | 2 +- src/calibre/library/database2.py | 6 ++++++ src/calibre/library/field_metadata.py | 2 +- src/calibre/library/server/__init__.py | 12 +++++++++++- src/calibre/library/server/mobile.py | 3 ++- src/calibre/library/server/opds.py | 3 ++- src/calibre/library/server/xml.py | 3 ++- 8 files changed, 43 insertions(+), 6 deletions(-) diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index 04b861605e..095eba0c3d 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -145,6 +145,24 @@ add_new_book_tags_when_importing_books = False # Set the maximum number of tags to show per book in the content server max_content_server_tags_shown=5 +# Set custom metadata fields that the content server will or will not display. +# content_server_will_display is a list of custom fields to be displayed. +# content_server_wont_display is a list of custom fields not to be displayed. +# wont_display has priority over will_display. +# The special value '*' means all custom fields. +# Defaults: +# content_server_will_display = ['*'] +# content_server_wont_display = [''] +# Examples: +# To display only the custom fields #mytags and #genre: +# content_server_will_display = ['#mytags', '#genre'] +# content_server_wont_display = [''] +# To display all fields except #mycomments: +# content_server_will_display = ['*'] +# content_server_wont_display['#mycomments'] +content_server_will_display = ['*'] +content_server_wont_display = [''] + # Set the maximum number of sort 'levels' that calibre will use to resort the # library after certain operations such as searches or device insertion. Each diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 640a588d29..af1b42bf33 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -132,7 +132,7 @@ class BooksModel(QAbstractTableModel): # {{{ def set_database(self, db): self.db = db - self.custom_columns = self.db.field_metadata.get_custom_field_metadata() + self.custom_columns = self.db.field_metadata.custom_field_metadata() self.column_map = list(self.orig_headers.keys()) + \ list(self.custom_columns) def col_idx(name): diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 773a4bdc9f..c7c4926b14 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -554,6 +554,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def search_term_to_field_key(self, term): return self.field_metadata.search_term_to_key(term) + def custom_field_metadata(self): + return self.field_metadata.custom_field_metadata() + + def all_metadata(self): + return self.field_metadata.all_metadata() + def metadata_for_field(self, key): return self.field_metadata[key] diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index bac423f46d..d608dca49d 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -411,7 +411,7 @@ class FieldMetadata(dict): l[k] = self._tb_cats[k] return l - def get_custom_field_metadata(self): + def custom_field_metadata(self): l = {} for k in self._tb_cats: if self._tb_cats[k]['is_custom']: diff --git a/src/calibre/library/server/__init__.py b/src/calibre/library/server/__init__.py index 5050dfaa99..7cdea9f602 100644 --- a/src/calibre/library/server/__init__.py +++ b/src/calibre/library/server/__init__.py @@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en' import os -from calibre.utils.config import Config, StringConfig, config_dir +from calibre.utils.config import Config, StringConfig, config_dir, tweaks listen_on = '0.0.0.0' @@ -46,6 +46,16 @@ def server_config(defaults=None): 'to disable grouping.')) return c +def custom_fields_to_display(db): + ckeys = db.custom_field_keys() + yes_fields = set(tweaks['content_server_will_display']) + no_fields = set(tweaks['content_server_wont_display']) + if '*' in yes_fields: + yes_fields = set(ckeys) + if '*' in no_fields: + no_fields = set(ckeys) + return frozenset(yes_fields - no_fields) + def main(): from calibre.library.server.main import main return main() diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index c0a3c122cd..071c7b1077 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -13,6 +13,7 @@ from lxml import html from lxml.html.builder import HTML, HEAD, TITLE, LINK, DIV, IMG, BODY, \ OPTION, SELECT, INPUT, FORM, SPAN, TABLE, TR, TD, A, HR +from calibre.library.server import custom_fields_to_display from calibre.library.server.utils import strftime, format_tag_string from calibre.ebooks.metadata import fmt_sidx from calibre.constants import __appname__ @@ -197,7 +198,7 @@ class MobileServer(object): self.sort(items, sort, (order.lower().strip() == 'ascending')) CFM = self.db.field_metadata - CKEYS = [key for key in sorted(CFM.get_custom_fields(), + CKEYS = [key for key in sorted(custom_fields_to_display(self.db), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] # This method uses its own book dict, not the Metadata dict. The loop diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index d495f58fa1..0e6917c504 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -17,6 +17,7 @@ import routes from calibre.constants import __appname__ from calibre.ebooks.metadata import fmt_sidx from calibre.library.comments import comments_to_html +from calibre.library.server import custom_fields_to_display from calibre.library.server.utils import format_tag_string from calibre import guess_type from calibre.utils.ordered_dict import OrderedDict @@ -277,7 +278,7 @@ class AcquisitionFeed(NavFeed): db): NavFeed.__init__(self, id_, updated, version, offsets, page_url, up_url) CFM = db.field_metadata - CKEYS = [key for key in sorted(CFM.get_custom_fields(), + CKEYS = [key for key in sorted(custom_fields_to_display(db), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] for item in items: diff --git a/src/calibre/library/server/xml.py b/src/calibre/library/server/xml.py index 45ffdc2737..12fcc217f0 100644 --- a/src/calibre/library/server/xml.py +++ b/src/calibre/library/server/xml.py @@ -11,6 +11,7 @@ import cherrypy from lxml.builder import ElementMaker from lxml import etree +from calibre.library.server import custom_fields_to_display from calibre.library.server.utils import strftime, format_tag_string from calibre.ebooks.metadata import fmt_sidx from calibre.constants import preferred_encoding @@ -94,7 +95,7 @@ class XMLServer(object): c = kwargs.pop('comments') CFM = self.db.field_metadata - CKEYS = [key for key in sorted(CFM.get_custom_fields(), + CKEYS = [key for key in sorted(custom_fields_to_display(self.db), cmp=lambda x,y: cmp(CFM[x]['name'].lower(), CFM[y]['name'].lower()))] custcols = [] From 67c7555fd0eb22802892ec716ec5564f3d423bc4 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 11:36:26 +0100 Subject: [PATCH 107/235] Fix content server gui.js bug where it put '...' on the end of a list even if the list was exactly the right size. --- resources/content_server/gui.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/content_server/gui.js b/resources/content_server/gui.js index bd0743a854..86cd04289b 100644 --- a/resources/content_server/gui.js +++ b/resources/content_server/gui.js @@ -63,8 +63,9 @@ function render_book(book) { if (tags) { t = tags.split(':&:', 2); m = parseInt(t[0]); + tall = t[1].split(','); t = t[1].split(',', m); - if (t.length == m) t[m] = '...' + if (tall.length > m) t[m] = '...' title += 'Tags=[{0}] '.format(t.join(',')); } custcols = book.attr("custcols").split(',') From ad69ef985a04b5485550f83661ee0b56723605f1 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 12:27:39 +0100 Subject: [PATCH 108/235] Add a 'test' function to templates. Analogous to lookup, but inserts plain text instead of a template. --- src/calibre/utils/formatter.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index a98f0e7f45..5c5893576c 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -23,6 +23,12 @@ class TemplateFormatter(string.Formatter): else: return self.vformat('{'+field_not_set.strip()+'}', [], self.kwargs) + def _test(self, val, value_if_set, value_not_set): + if val: + return value_if_set + else: + return value_not_set + def _ifempty(self, val, value_if_empty): if val: return val @@ -45,6 +51,7 @@ class TemplateFormatter(string.Formatter): 'ifempty' : (1, _ifempty), 'lookup' : (2, _lookup), 'shorten' : (3, _shorten), + 'test' : (2, _lookup), } format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$') From b2a6ed3af48a47c5cc7bb3372a3b084a004b7fcf Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 12:43:54 +0100 Subject: [PATCH 109/235] 1) fix bulk edit to not display a tab if library has only composite columns 2) fix a reference to get_custom_field_metadata that I somehow missed. --- src/calibre/gui2/dialogs/metadata_bulk.py | 3 ++- src/calibre/gui2/preferences/columns.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index a9e45087fd..1e3576e333 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -167,7 +167,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.tag_editor_button.clicked.connect(self.tag_editor) self.autonumber_series.stateChanged[int].connect(self.auto_number_changed) - if len(db.custom_column_label_map) == 0: + if len([k for k in db.custom_field_metadata().values() + if k['datatype'] != 'composite']) == 0: self.central_widget.removeTab(1) else: self.create_custom_column_editors() diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py index c1b9230f42..03a50e6f3a 100644 --- a/src/calibre/gui2/preferences/columns.py +++ b/src/calibre/gui2/preferences/columns.py @@ -21,7 +21,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): def genesis(self, gui): self.gui = gui db = self.gui.library_view.model().db - self.custcols = copy.deepcopy(db.field_metadata.get_custom_field_metadata()) + self.custcols = copy.deepcopy(db.field_metadata.custom_field_metadata()) self.column_up.clicked.connect(self.up_column) self.column_down.clicked.connect(self.down_column) From 529756238340e0dd66c3be0cfc1f5f7a8a178cfa Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 12:57:49 +0100 Subject: [PATCH 110/235] Refactor code to clean interfaces and remove overly complex loop in bulk edit --- src/calibre/gui2/dialogs/metadata_bulk.py | 3 +-- src/calibre/library/database2.py | 8 ++++---- src/calibre/library/field_metadata.py | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 1e3576e333..b14390e001 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -167,8 +167,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.tag_editor_button.clicked.connect(self.tag_editor) self.autonumber_series.stateChanged[int].connect(self.auto_number_changed) - if len([k for k in db.custom_field_metadata().values() - if k['datatype'] != 'composite']) == 0: + if len(db.custom_field_keys(include_composites=False)) == 0: self.central_widget.removeTab(1) else: self.create_custom_column_editors() diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index c7c4926b14..22175d3910 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -539,8 +539,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def standard_field_keys(self): return self.field_metadata.standard_field_keys() - def custom_field_keys(self): - return self.field_metadata.custom_field_keys() + def custom_field_keys(self, include_composites=True): + return self.field_metadata.custom_field_keys(include_composites) def all_field_keys(self): return self.field_metadata.all_field_keys() @@ -554,8 +554,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def search_term_to_field_key(self, term): return self.field_metadata.search_term_to_key(term) - def custom_field_metadata(self): - return self.field_metadata.custom_field_metadata() + def custom_field_metadata(self, include_composites=True): + return self.field_metadata.custom_field_metadata(include_composites) def all_metadata(self): return self.field_metadata.all_metadata() diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index d608dca49d..37393d0d2c 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -358,10 +358,14 @@ class FieldMetadata(dict): if self._tb_cats[k]['kind']=='field' and not self._tb_cats[k]['is_custom']] - def custom_field_keys(self): - return [k for k in self._tb_cats.keys() - if self._tb_cats[k]['kind']=='field' and - self._tb_cats[k]['is_custom']] + def custom_field_keys(self, include_composites=True): + res = [] + for k in self._tb_cats.keys(): + fm = self._tb_cats[k] + if fm['kind']=='field' and fm['is_custom'] and \ + (fm['datatype'] != 'composite' or include_composites): + res.append(k) + return res def all_field_keys(self): return [k for k in self._tb_cats.keys() if self._tb_cats[k]['kind']=='field'] @@ -402,20 +406,16 @@ class FieldMetadata(dict): return self.custom_label_to_key_map[label] raise ValueError('Unknown key [%s]'%(label)) - def get_custom_fields(self): - return [l for l in self._tb_cats if self._tb_cats[l]['is_custom']] - def all_metadata(self): l = {} for k in self._tb_cats: l[k] = self._tb_cats[k] return l - def custom_field_metadata(self): + def custom_field_metadata(self, include_composites=True): l = {} - for k in self._tb_cats: - if self._tb_cats[k]['is_custom']: - l[k] = self._tb_cats[k] + for k in self.custom_field_keys(include_composites): + l[k] = self._tb_cats[k] return l def add_custom_field(self, label, table, column, datatype, colnum, name, From 25905a349c745108abd6290d5835b109359a72de Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 13:20:26 +0100 Subject: [PATCH 111/235] Test the 'test' function. Add 're' function and test it. --- src/calibre/utils/formatter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index 5c5893576c..c6bcaa1c3e 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -43,6 +43,9 @@ class TemplateFormatter(string.Formatter): else: return val + def _re(self, val, pattern, replacement): + return re.sub(pattern, replacement, val) + functions = { 'uppercase' : (0, lambda s,x: x.upper()), 'lowercase' : (0, lambda s,x: x.lower()), @@ -50,8 +53,9 @@ class TemplateFormatter(string.Formatter): 'capitalize' : (0, lambda s,x: x.capitalize()), 'ifempty' : (1, _ifempty), 'lookup' : (2, _lookup), + 're' : (2, _re), 'shorten' : (3, _shorten), - 'test' : (2, _lookup), + 'test' : (2, _test), } format_string_re = re.compile(r'^(.*)\|(.*)\|(.*)$') From 211bb81113865b1cb38c2f8697b33694a4bb38fe Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 14:43:07 +0100 Subject: [PATCH 112/235] Put back the sanitize after split on slashes. --- src/calibre/library/save_to_disk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index a58686f709..e479d27121 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -166,6 +166,7 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250, components = safe_formatter.safe_format(template, format_args, '', mi, sanitize=sanitize_func) components = [x.strip() for x in components.split('/') if x.strip()] + components = [sanitize_func(x) for x in components if x] if not components: components = [str(id)] components = [x.encode(filesystem_encoding, 'replace') if isinstance(x, From 93c8836cb6622579323d95f86dfb6fa03dda78cb Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 15:18:03 +0100 Subject: [PATCH 113/235] Changes to template faq --- src/calibre/manual/template_lang.rst | 85 +++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 59e5c1da4c..6d87a90c93 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -7,9 +7,9 @@ The |app| template language ======================================================= The |app| template language is used in various places. It is used to control the folder structure and file name when saving files from the |app| library to the disk or eBook reader. -It is used to define "virtual" columns that contain data from other columns and so on. +It is also used to define "virtual" columns that contain data from other columns and so on. -In essence, the template language is very simple. The basic idea is that a template consists of names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: +The basi template language is very simple, but has very powerful advanced features. The basic idea is that a template consists of names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: {author_sort}/{title}/{title} - {authors} @@ -17,7 +17,9 @@ For the book "The Foundation" by "Isaac Asimov" it will become:: Asimov, Isaac/The Foundation/The Foundation - Isaac Asimov -You can use all the various metadata fields available in calibre in a template, including the custom columns you have created yourself. To find out the template name for a column sinply hover your mouse over the column header. Names for custom fields (columns you have created yourself) are always prefixed by an #. For series type fields, there is always an additional field named ``series_index`` that becomes the series index for that series. So if you have a custom series field named #myseries, there will also be a field named #myseries_index. In addition to the column based fields, you also can use:: +You can use all the various metadata fields available in calibre in a template, including any custom columns you have created yourself. To find out the template name for a column simply hover your mouse over the column header. Names for custom fields (columns you have created yourself) always have a # as the first character. For series type custom fields, there is always an additional field named ``#seriesname_index`` that becomes the series index for that series. So if you have a custom series field named #myseries, there will also be a field named #myseries_index. + +In addition to the column based fields, you also can use:: {formats} - A list of formats available in the calibre library for a book {isbn} - The ISBN number of the book @@ -26,7 +28,7 @@ If a particular book does not have a particular piece of metadata, the field in {author_sort}/{series}/{title} {series_index} -will become:: +If a book has a series, the template will produce:: {Asimov, Isaac}/Foundation/Second Foundation - 3 @@ -40,35 +42,90 @@ and if a book does not have a series:: Advanced formatting ---------------------- -You can do more than just simple substitution with the templates. You can also conditionally include text and control how the substituted data is formatted. +You can do more than just simple substitution with the templates. You can also conditionally include text and control how the substituted data is formatted. + +First, conditionally including text. There are cases where you might want to have text appear in the output only if a field is not empty. A common case is series and series_index, where you want either nothing or the two values with a hyphen between them. Calibre handles this case using a special field syntax. -Regarding conditionally including text: there are cases where you might want to have text appear in the output only if a field is not empty. A common case is series and series_index, where you want either nothing or the two values with a hyphen between them. Calibre handles this case using a special field syntax. For example, assume you want to use the template {series} - {series_index} - {title} -Unfortunately, if the book has no series, the answer will be '- - title'. Many people would rather it be simply 'title', without the hyphens. To do this, use the extended syntax {some_text|field|other_text}. When you use this syntax, if field has the value SERIES then the result will be some_textSERIESother_text. If field has no value, then the result will be the empty string (nothing). Using this syntax, we can solve the above series problem with the template:: +If the book has no series, the answer will be '- - title'. Many people would rather the result be simply 'title', without the hyphens. To do this, use the extended syntax `{field:|prefix_text|suffix_text}`. When you use this syntax, if field has the value SERIES then the result will be prefix_textSERIESsuffix_text. If field has no value, then the result will be the empty string (nothing). The prefix and suffix can contain blanks. - {series}{ - |series_index| - }{title} +Using this syntax, we can solve the above series problem with the template: -The hyphens will be included only if the book has a series index. Note: you must either use no | characters or both of them. Using one, such as in {field| - }, is not allowed. It is OK to not provide any text for one side or the other, such as in {\|series\| - }. Using {\|title\|} is the same as using {title}. + {series}{series_index:| - | - }{title} -Now to formatting. Suppose you wanted to ensure that the series_index is always formatted as three digits with leading zeros. This would do the trick:: +The hyphens will be included only if the book has a series index. + +Notes: you must include the : character if you want to use a prefix or a suffix. You must either use no | characters or both of them; using one, as in `{field:| - }`, is not allowed. It is OK not to provide any text for one side or the other, such as in `{series:|| - }`. Using `{title:||}` is the same as using `{title}`. + +Second: formatting. Suppose you wanted to ensure that the series_index is always formatted as three digits with leading zeros. This would do the trick:: {series_index:0>3s} - Three digits with leading zeros -If instead of leading zeros you want leading spaces, use:: +If instead of leading zeros you want leading spaces, use: - {series_index:>3s} - Thre digits with leading spaces + {series_index:>3s} - Three digits with leading spaces -For trailing zeros, use:: +For trailing zeros, use: {series_index:0<3s} - Three digits with trailing zeros -If you want only the first two letters of the data to be rendered, use:: +If you want only the first two letters of the data, use:: {author_sort:.2} - Only the first two letter of the author sort name The |app| template language comes from python and for more details on the syntax of these advanced formatting operations, look at the `Python documentation `_. +Advanced features +------------------ + +Using templates in custom columns +---------------------------------- + +There are sometimes cases where you want to display metadata that |app| does not normally display, or to display data in a way different from how |app| normally does. For example, you might want to display the ISBN, a field that |app| does not display. You can use custom columns for this. To do so, you create a column with the type 'column built from other columns' (hereafter called composite columns), enter a template, and |app| will display in the column the result of evaluating that template. To display the isbn, create the column and enter `{isbn}` into the template box. To display a column containing the values of two series custom columns separated by a comma, use `{#series1:||,}{#series2}`. + +Composite columns can use any template option, including formatting. + +You cannot change the data contained in a composite column. If you edit a composite column by double-clicking on any item, you will open the template for editing, not the underlying data. Editing the template on the GUI is a quick way of testing and changing composite columns. + +Using functions in templates +----------------------------- + +Suppose you want to display the value of a field in upper case, when that field is normally in title case. You can do this (and many more things) using the functions available for templates. For example, to display the title in upper case, use `{title:uppercase()}`. To display it in title case, use `{title:titlecase()}`. + +Function references replace the formatting specification, going after the : and before the first `|` or the closing `}`. Functions must always end with `()`. Some functions take extra values (arguments), and these go inside the `()`. + +The syntax for using functions is `{field:function(arguments)}`, or `{field:function(arguments)|prefix|suffix}`. Argument values cannot contain a comma, because it is used to separate arguments. Functions return the value of the field used in the template, suitably modified. + +The functions available are: + +* `lowercase()` -- return value of the field in lower case. +* `uppercase()` -- return the value of the field in upper case. +* `titlecase()` -- return the value of the field in title case. +* `capitalize()` -- return the value as capitalized. +* `ifempty(text)` -- if the field is not empty, return the value of the field. Otherwise return `text`. +* `test(text if not empty, text if empty)` -- return `text if not empty` if the field is not empty, otherwise return `text if empty`. +* `shorten(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. +* `lookup(field if not empty, field if empty)` -- like test, 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 (more later). +* `re(pattern, replacement)` -- return the field after applying the regular expression. All instances of `pattern` are replaced with `replacement`. As in all of |app|, these are python-compatible regular expressions. + +Special notes for save/send templates +------------------------------------- + +Special processing is applied when a template is used in a `save to disk` or `send to device` template. The values of the fields are cleaned, replacing characters that are special to file systems with underscores, including slashes. This means that field text cannot be used to create folders. However, slashes are not changed in prefix or suffix strings, so slashes in these strings will cause folders to be created. Because of this, you can create variable-depth folder structure. + +For example, assume we want the folder structure `series/series_index - title`, with the caveat that if series does not exist, then the title should be in the top folder. The template to do this is + + {series:||/}{series_index:|| - }{title} + +The slash and the hyphen appear only if series is not empty. + +The lookup function lets us do even fancier processing. For example, assume we want the following: if a book has a series, then we want the folder structure `series/series index - title.fmt`. If the book does not have a series, then we want the folder structure `genre/author_sort/title.fmt`. If the book has no genre, use 'Unknown'. We want two completely different paths, depending on the value of series. + +To accomplish this, we: +1. Create a composite field (call it AA) containing `{series:||}/{series_index} - {title'}`. If the series is not empty, then this template will produce `series/series_index - title`. +2. Create a composite field (call it BB) containing `{#genre:ifempty(Unknown)}/{author_sort}/{title}`. This template produces `genre/author_sort/title`, where an empty genre is replaced wuth `Unknown`. +3. Set the save template to `{series:lookup(AA,BB)}`. This template chooses composite field AA if series is not empty, and composite field BB if series is empty. We therefore have two completely different save paths, depending on whether or not `series` is empty. From 02e9160f3752c179391bfddbb1b3febb9cb3a517 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 15:23:35 +0100 Subject: [PATCH 114/235] Fix typo --- src/calibre/manual/template_lang.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 6d87a90c93..2c49cfe308 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -9,7 +9,7 @@ The |app| template language The |app| template language is used in various places. It is used to control the folder structure and file name when saving files from the |app| library to the disk or eBook reader. It is also used to define "virtual" columns that contain data from other columns and so on. -The basi template language is very simple, but has very powerful advanced features. The basic idea is that a template consists of names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: +The basic template language is very simple, but has very powerful advanced features. The basic idea is that a template consists of names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: {author_sort}/{title}/{title} - {authors} From 60e77299062148aa04e325de03b8089d26781234 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 08:33:42 -0600 Subject: [PATCH 115/235] Don't put duplicates in dirtied_queue --- src/calibre/library/database2.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 6a0d442927..dc320eb011 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -578,13 +578,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): return True def dirtied(self, book_ids, commit=True): - self.conn.executemany( - 'INSERT OR REPLACE INTO metadata_dirtied (book) VALUES (?)', - [(x,) for x in book_ids]) + for book in book_ids: + try: + self.conn.execute( + 'INSERT INTO metadata_dirtied (book) VALUES (?)', + (book,)) + self.dirtied_queue.put(book) + except IntegrityError: + # Already in table + continue if commit: self.conn.commit() - for x in book_ids: - self.dirtied_queue.put(x) def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' From 41ebe2bd1443bbf2a88731c6d1919a8207f08275 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 09:00:46 -0600 Subject: [PATCH 116/235] calibredb now does a backup of changed metadata --- src/calibre/library/caches.py | 9 ++++++--- src/calibre/library/cli.py | 8 ++++++-- src/calibre/library/database2.py | 6 +++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 0b5a922209..714579ec77 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -36,14 +36,14 @@ class MetadataBackup(Thread): # {{{ def run(self): while self.keep_running: try: - id_ = self.db.dirtied_queue.get(True, 5) + id_ = self.db.dirtied_queue.get() except Empty: continue except: # Happens during interpreter shutdown break if self.dump_func([id_]) is None: - # An exception occured in dump_func, retry once + # An exception occurred in dump_func, retry once prints('Failed to backup metadata for id:', id_, 'once') time.sleep(2) if not self.dump_func([id_]): @@ -84,9 +84,12 @@ class CoverCache(Thread): # {{{ def run(self): while self.keep_running: try: - id_ = self.load_queue.get(True, 1) + id_ = self.load_queue.get() except Empty: continue + except: + #Happens during interpreter shutdown + break try: img = self._image_for_id(id_) except: diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index cd4e472807..6ff17b0781 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -32,8 +32,9 @@ def send_message(msg=''): t.conn.send('refreshdb:'+msg) t.conn.close() - - +def write_dirtied(db): + prints('Backing up metadata') + db.dump_metadata() def get_parser(usage): parser = OptionParser(usage) @@ -259,6 +260,7 @@ def do_add(db, paths, one_book_per_directory, recurse, add_duplicates): print >>sys.stderr, '\t', title+':' print >>sys.stderr, '\t\t ', path + write_dirtied(db) send_message() finally: sys.stdout = orig @@ -299,6 +301,7 @@ def do_add_empty(db, title, authors, isbn): if isbn: mi.isbn = isbn db.import_book(mi, []) + write_dirtied() send_message() def command_add(args, dbpath): @@ -452,6 +455,7 @@ def do_set_metadata(db, id, stream): db.set_metadata(id, mi) db.clean() do_show_metadata(db, id, False) + write_dirtied() send_message() def set_metadata_option_parser(): diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index dc320eb011..bdaa643d83 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -557,7 +557,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def metadata_for_field(self, key): return self.field_metadata[key] - def dump_metadata(self, book_ids, remove_from_dirtied=True, commit=True): + def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True): + 'Write metadata for each record to an individual OPF file' + if book_ids is None: + book_ids = [x[0] for x in self.conn.get( + 'SELECT book FROM metadata_dirtied', all=True)] for book_id in book_ids: if not self.data.has_id(book_id): continue From c67a9d848745c4fd4280b370583160bad288cbbd Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 16:38:11 +0100 Subject: [PATCH 117/235] Changes to device editable columns to give fine-grain control over what columns can be edited. --- src/calibre/devices/folder_device/driver.py | 2 +- src/calibre/devices/interface.py | 2 +- src/calibre/devices/kobo/driver.py | 16 +++++++------- src/calibre/devices/prs505/driver.py | 2 +- src/calibre/devices/usbms/driver.py | 2 +- src/calibre/gui2/library/models.py | 23 ++++++++++++++------- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py index 9cd1280cc9..5919d6d2fb 100644 --- a/src/calibre/devices/folder_device/driver.py +++ b/src/calibre/devices/folder_device/driver.py @@ -38,7 +38,7 @@ class FOLDER_DEVICE(USBMS): THUMBNAIL_HEIGHT = 68 # Height for thumbnails on device - CAN_SET_METADATA = True + CAN_SET_METADATA = ['title', 'authors'] SUPPORTS_SUB_DIRS = True #: Icon for this device diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index fc3332a337..2307bf94d6 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -37,7 +37,7 @@ class DevicePlugin(Plugin): THUMBNAIL_HEIGHT = 68 #: Whether the metadata on books can be set via the GUI. - CAN_SET_METADATA = True + CAN_SET_METADATA = ['title', 'authors', 'collections'] #: Path separator for paths to books on device path_sep = os.sep diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index f06a804b93..b8516aab4f 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -30,7 +30,7 @@ class KOBO(USBMS): # Ordered list of supported formats FORMATS = ['epub', 'pdf'] - CAN_SET_METADATA = True + CAN_SET_METADATA = ['collections'] VENDOR_ID = [0x2237] PRODUCT_ID = [0x4161] @@ -126,7 +126,7 @@ class KOBO(USBMS): book = self.book_from_path(prefix, lpath, title, authors, mime, date, ContentType, ImageID) # print 'Update booklist' book.device_collections = [playlist_map[lpath]] if lpath in playlist_map else [] - + if bl.add_book(book, replace_metadata=False): changed = True except: # Probably a path encoding error @@ -250,7 +250,7 @@ class KOBO(USBMS): # print "Delete file normalized path: " + path extension = os.path.splitext(path)[1] ContentType = self.get_content_type_from_extension(extension) - + ContentID = self.contentid_from_path(path, ContentType) ImageID = self.delete_via_sql(ContentID, ContentType) @@ -453,7 +453,7 @@ class KOBO(USBMS): query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ReadStatus = 1 and ContentID like \'file:///mnt/sd/%\'' elif oncard != 'carda' and oncard != 'cardb': query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ReadStatus = 1 and ContentID not like \'file:///mnt/sd/%\'' - + try: cursor.execute (query) except: @@ -489,7 +489,7 @@ class KOBO(USBMS): query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ReadStatus = 2 and ContentID like \'file:///mnt/sd/%\'' elif oncard != 'carda' and oncard != 'cardb': query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ReadStatus = 2 and ContentID not like \'file:///mnt/sd/%\'' - + try: cursor.execute (query) except: @@ -519,7 +519,7 @@ class KOBO(USBMS): else: connection.commit() # debug_print('Database: Commit set ReadStatus as Finished') - else: # No collections + else: # No collections # Since no collections exist the ReadStatus needs to be reset to 0 (Unread) print "Reseting ReadStatus to 0" # Reset Im_Reading list in the database @@ -527,7 +527,7 @@ class KOBO(USBMS): query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID like \'file:///mnt/sd/%\'' elif oncard != 'carda' and oncard != 'cardb': query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID not like \'file:///mnt/sd/%\'' - + try: cursor.execute (query) except: @@ -541,7 +541,7 @@ class KOBO(USBMS): connection.close() # debug_print('Finished update_device_database_collections', collections_attributes) - + def sync_booklists(self, booklists, end_session=True): # debug_print('KOBO: started sync_booklists') paths = self.get_device_paths() diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py index f90a8ab263..7952660c21 100644 --- a/src/calibre/devices/prs505/driver.py +++ b/src/calibre/devices/prs505/driver.py @@ -27,7 +27,7 @@ class PRS505(USBMS): FORMATS = ['epub', 'lrf', 'lrx', 'rtf', 'pdf', 'txt'] - CAN_SET_METADATA = True + CAN_SET_METADATA = ['title', 'authors', 'collections'] VENDOR_ID = [0x054c] #: SONY Vendor Id PRODUCT_ID = [0x031e] diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index a0d1d9dbf8..b4fe5d25fc 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -50,7 +50,7 @@ class USBMS(CLI, Device): book_class = Book FORMATS = [] - CAN_SET_METADATA = False + CAN_SET_METADATA = [] METADATA_CACHE = 'metadata.calibre' def get_device_information(self, end_session=True): diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index af1b42bf33..8efd038db8 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -907,7 +907,7 @@ class DeviceBooksModel(BooksModel): # {{{ } self.marked_for_deletion = {} self.search_engine = OnDeviceSearch(self) - self.editable = True + self.editable = ['title', 'authors', 'collections'] self.book_in_library = None def mark_for_deletion(self, job, rows, rows_are_ids=False): @@ -953,13 +953,13 @@ class DeviceBooksModel(BooksModel): # {{{ if self.map[index.row()] in self.indices_to_be_deleted(): return Qt.ItemIsUserCheckable # Can't figure out how to get the disabled flag in python flags = QAbstractTableModel.flags(self, index) - if index.isValid() and self.editable: + if index.isValid(): cname = self.column_map[index.column()] - if cname in ('title', 'authors') or \ - (cname == 'collections' and \ - callable(getattr(self.db, 'supports_collections', None)) and \ - self.db.supports_collections() and \ - prefs['manage_device_metadata']=='manual'): + if cname in self.editable and \ + cname != 'collections' or \ + (callable(getattr(self.db, 'supports_collections', None)) and \ + self.db.supports_collections() and \ + prefs['manage_device_metadata']=='manual'): flags |= Qt.ItemIsEditable return flags @@ -1243,7 +1243,14 @@ class DeviceBooksModel(BooksModel): # {{{ def set_editable(self, editable): # Cannot edit if metadata is sent on connect. Reason: changes will # revert to what is in the library on next connect. - self.editable = editable and prefs['manage_device_metadata']!='on_connect' + if isinstance(editable, list): + self.editable = editable + elif editable: + self.editable = ['title', 'authors', 'collections'] + else: + self.editable = [] + if prefs['manage_device_metadata']=='on_connect': + self.editable = [] def set_search_restriction(self, s): pass From 993983a70767b56d2ecde432fcea828068d8e7f9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 10:05:54 -0600 Subject: [PATCH 118/235] Oops. Restore removed call to commit in set_path and have set_path call dirtied. Also limit the rate of metadata backups --- src/calibre/library/caches.py | 1 + src/calibre/library/database2.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 714579ec77..339f1393f5 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -48,6 +48,7 @@ class MetadataBackup(Thread): # {{{ time.sleep(2) if not self.dump_func([id_]): prints('Failed to backup metadata for id:', id_, 'again, giving up') + time.sleep(0.2) # Limit to five per second # }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index a34ef9cf89..f62c4ce074 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -455,6 +455,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.add_format(id, format, stream, index_is_id=True, path=tpath, notify=False) self.conn.execute('UPDATE books SET path=? WHERE id=?', (path, id)) + self.dirtied([id], commit=False) + self.commit() self.data.set(id, self.FIELD_MAP['path'], path, row_is_id=True) # Delete not needed directories if current_path and os.path.exists(spath): From a11ccd8598d3ba3cf34599647d58666b49038302 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 17:20:26 +0100 Subject: [PATCH 119/235] Added 'contains' function to templates --- src/calibre/manual/template_lang.rst | 1 + src/calibre/utils/formatter.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 5f672c4989..0c3a87a157 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -108,6 +108,7 @@ The functions available are: * ``capitalize()`` -- return the value as capitalized. * ``ifempty(text)`` -- if the field is not empty, return the value of the field. Otherwise return `text`. * ``test(text if not empty, text if empty)`` -- return `text if not empty` if the field is not empty, otherwise return `text if empty`. + * ``contains(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`. * ``shorten(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. * ``lookup(field if not empty, field if empty)`` -- like test, 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 (more later). * ``re(pattern, replacement)`` -- return the field after applying the regular expression. All instances of `pattern` are replaced with `replacement`. As in all of |app|, these are python-compatible regular expressions. diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index c6bcaa1c3e..6fed4e157a 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -29,6 +29,15 @@ class TemplateFormatter(string.Formatter): else: return value_not_set + def _contains(self, val, test, value_if_present, value_if_not): + if re.search(test, val): + return value_if_present + else: + return value_if_not + + def _re(self, val, pattern, replacement): + return re.sub(pattern, replacement, val) + def _ifempty(self, val, value_if_empty): if val: return val @@ -43,14 +52,12 @@ class TemplateFormatter(string.Formatter): else: return val - def _re(self, val, pattern, replacement): - return re.sub(pattern, replacement, val) - functions = { 'uppercase' : (0, lambda s,x: x.upper()), 'lowercase' : (0, lambda s,x: x.lower()), 'titlecase' : (0, lambda s,x: x.title()), 'capitalize' : (0, lambda s,x: x.capitalize()), + 'contains' : (3, _contains), 'ifempty' : (1, _ifempty), 'lookup' : (2, _lookup), 're' : (2, _re), From 7d9ca9dda75a03ae6d8b97660e05017193cc8ba3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 10:40:53 -0600 Subject: [PATCH 120/235] ... --- src/calibre/library/caches.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 339f1393f5..1e52350e46 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -97,8 +97,12 @@ class CoverCache(Thread): # {{{ import traceback traceback.print_exc() continue - with self.lock: - self.cache[id_] = img + try: + with self.lock: + self.cache[id_] = img + except: + # Happens during interpreter shutdown + break def set_cache(self, ids): with self.lock: From f782ef0cb6348cc3deea6fe515ace73b5dd18b92 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 17:56:27 +0100 Subject: [PATCH 121/235] Make format_field return '' instead of None when the value really is '' --- src/calibre/ebooks/metadata/book/base.py | 18 +++++++++--------- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/server/mobile.py | 3 +-- src/calibre/library/server/opds.py | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 8791d59242..87d034aba8 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -432,14 +432,14 @@ class Metadata(object): if key in self.user_metadata_keys(): res = self.get(key, None) cmeta = self.get_user_metadata(key, make_copy=False) + name = unicode(cmeta['name']) if cmeta['datatype'] != 'composite' and (res is None or res == ''): - return (None, None, None, None) + return (name, res, None, None) orig_res = res cmeta = self.get_user_metadata(key, make_copy=False) if res is None or res == '': - return (None, None, None, None) + return (name, res, None, None) orig_res = res - name = unicode(cmeta['name']) datatype = cmeta['datatype'] if datatype == 'text' and cmeta['is_multiple']: res = u', '.join(res) @@ -454,11 +454,12 @@ class Metadata(object): if key in field_metadata and field_metadata[key]['kind'] == 'field': res = self.get(key, None) - if res is None or res == '': - return (None, None, None, None) - orig_res = res fmeta = field_metadata[key] name = unicode(fmeta['name']) + if res is None or res == '': + return (name, res, None, None) + orig_res = res + name = unicode(fmeta['name']) datatype = fmeta['datatype'] if key == 'authors': res = authors_to_string(res) @@ -508,9 +509,8 @@ class Metadata(object): fmt('Rights', unicode(self.rights)) for key in self.user_metadata_keys(): val = self.get(key, None) - if val is not None: - (name, val) = self.format_field(key) - fmt(name, unicode(val)) + (name, val) = self.format_field(key) + fmt(name, unicode(val)) return u'\n'.join(ans) def to_html(self): diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index d19bed49fe..fe1701a918 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -327,7 +327,7 @@ class BooksModel(QAbstractTableModel): # {{{ mi = self.db.get_metadata(idx) for key in mi.user_metadata_keys(): name, val = mi.format_field(key) - if val is not None: + if val: data[name] = val return data diff --git a/src/calibre/library/server/mobile.py b/src/calibre/library/server/mobile.py index 071c7b1077..c51de90c6d 100644 --- a/src/calibre/library/server/mobile.py +++ b/src/calibre/library/server/mobile.py @@ -125,7 +125,6 @@ def build_index(books, num, search, sort, order, start, total, url_base, CKEYS): series = u'[%s - %s]'%(book['series'], book['series_index']) \ if book['series'] else '' tags = u'Tags=[%s]'%book['tags'] if book['tags'] else '' - print tags ctext = '' for key in CKEYS: @@ -231,7 +230,7 @@ class MobileServer(object): return '%s:#:%s'%(name, unicode(val)) mi = self.db.get_metadata(record[CFM['id']['rec_index']], index_is_id=True) name, val = mi.format_field(key) - if val is None: + if not val: continue datatype = CFM[key]['datatype'] if datatype in ['comments']: diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py index 0e6917c504..bd5b2f36b3 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -160,7 +160,7 @@ def ACQUISITION_ENTRY(item, version, db, updated, CFM, CKEYS): for key in CKEYS: mi = db.get_metadata(item[CFM['id']['rec_index']], index_is_id=True) name, val = mi.format_field(key) - if val is not None: + if not val: datatype = CFM[key]['datatype'] if datatype == 'text' and CFM[key]['is_multiple']: extra.append('%s: %s
'%(name, format_tag_string(val, ',', From fb06e4c72eacb21b6f101d6f7e7d7a1785450a86 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 11:04:18 -0600 Subject: [PATCH 122/235] ... --- src/calibre/gui2/add.py | 7 ++----- src/calibre/library/database2.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 9f246aeb93..1d7b5075b4 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -381,11 +381,7 @@ class Adder(QObject): # {{{ # }}} -############################################################################### -############################## END ADDER ###################################### -############################################################################### - -class Saver(QObject): +class Saver(QObject): # {{{ def __init__(self, parent, db, callback, rows, path, opts, spare_server=None): @@ -446,4 +442,5 @@ class Saver(QObject): self.pd.set_msg(_('Saved')+' '+title) if not ok: self.failures.add((title, tb)) +# }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index a9160f976f..4775e13818 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -1924,7 +1924,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.timestamp = utcnow() if mi.pubdate is None: mi.pubdate = utcnow() - self.set_metadata(id, mi) + self.set_metadata(id, mi, ignore_errors=True) if cover is not None: try: self.set_cover(id, cover) From 4b92c7d68b70c03b3d1b46d17fc643ab7bb00f5d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 18:17:15 +0100 Subject: [PATCH 123/235] Don't put '' values into __unicode__ and to_html --- src/calibre/ebooks/metadata/book/base.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 87d034aba8..df64d16c26 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -509,8 +509,9 @@ class Metadata(object): fmt('Rights', unicode(self.rights)) for key in self.user_metadata_keys(): val = self.get(key, None) - (name, val) = self.format_field(key) - fmt(name, unicode(val)) + if val: + (name, val) = self.format_field(key) + fmt(name, unicode(val)) return u'\n'.join(ans) def to_html(self): @@ -533,7 +534,7 @@ class Metadata(object): ans += [(_('Rights'), unicode(self.rights))] for key in self.user_metadata_keys(): val = self.get(key, None) - if val is not None: + if val: (name, val) = self.format_field(key) ans += [(name, val)] for i, x in enumerate(ans): From fef5703c1eb74e80c7c5a079f8b5ba3dc473bde8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 11:32:21 -0600 Subject: [PATCH 124/235] Conversion pipeline: Fix merging of metadata, broken by new Metadata class --- src/calibre/ebooks/metadata/book/base.py | 5 ++++ src/calibre/ebooks/oeb/transforms/metadata.py | 30 +++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 87d034aba8..28a5f21a46 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -76,6 +76,11 @@ class Metadata(object): self.author = list(authors) if authors else []# Needed for backward compatibility self.authors = list(authors) if authors else [] + def is_null(self, field): + null_val = NULL_VALUES.get(field, None) + val = getattr(self, field, None) + return not val or val == null_val + def __getattribute__(self, field): _data = object.__getattribute__(self, '_data') if field in TOP_LEVEL_CLASSIFIERS: diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py index 22a89f5a47..4bb25f650e 100644 --- a/src/calibre/ebooks/oeb/transforms/metadata.py +++ b/src/calibre/ebooks/oeb/transforms/metadata.py @@ -12,33 +12,33 @@ from calibre import guess_type def meta_info_to_oeb_metadata(mi, m, log): from calibre.ebooks.oeb.base import OPF - if mi.title: + if not mi.is_null('title'): m.clear('title') m.add('title', mi.title) if mi.title_sort: if not m.title: m.add('title', mi.title_sort) m.title[0].file_as = mi.title_sort - if mi.authors: + if not mi.is_null('authors'): m.filter('creator', lambda x : x.role.lower() in ['aut', '']) for a in mi.authors: attrib = {'role':'aut'} if mi.author_sort: attrib[OPF('file-as')] = mi.author_sort m.add('creator', a, attrib=attrib) - if mi.book_producer: + if not mi.is_null('book_producer'): m.filter('contributor', lambda x : x.role.lower() == 'bkp') m.add('contributor', mi.book_producer, role='bkp') - if mi.comments: + if not mi.is_null('comments'): m.clear('description') m.add('description', mi.comments) - if mi.publisher: + if not mi.is_null('publisher'): m.clear('publisher') m.add('publisher', mi.publisher) - if mi.series: + if not mi.is_null('series'): m.clear('series') m.add('series', mi.series) - if mi.isbn: + if not mi.is_null('isbn'): has = False for x in m.identifier: if x.scheme.lower() == 'isbn': @@ -46,29 +46,29 @@ def meta_info_to_oeb_metadata(mi, m, log): has = True if not has: m.add('identifier', mi.isbn, scheme='ISBN') - if mi.language: + if not mi.is_null('language'): m.clear('language') m.add('language', mi.language) - if mi.series_index is not None: + if not mi.is_null('series_index'): m.clear('series_index') m.add('series_index', mi.format_series_index()) - if mi.rating is not None: + if not mi.is_null('rating'): m.clear('rating') m.add('rating', '%.2f'%mi.rating) - if mi.tags: + if not mi.is_null('tags'): m.clear('subject') for t in mi.tags: m.add('subject', t) - if mi.pubdate is not None: + if not mi.is_null('pubdate'): m.clear('date') m.add('date', isoformat(mi.pubdate)) - if mi.timestamp is not None: + if not mi.is_null('timestamp'): m.clear('timestamp') m.add('timestamp', isoformat(mi.timestamp)) - if mi.rights is not None: + if not mi.is_null('rights'): m.clear('rights') m.add('rights', mi.rights) - if mi.publication_type is not None: + if not mi.is_null('publication_type'): m.clear('publication_type') m.add('publication_type', mi.publication_type) if not m.timestamp: From 47ff1ddc42d8d08e145af1ebefaa38b93579b549 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 18:47:44 +0100 Subject: [PATCH 125/235] Minor updates to the FAQ --- src/calibre/manual/template_lang.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 0c3a87a157..1ab004f3f3 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -17,14 +17,14 @@ For the book "The Foundation" by "Isaac Asimov" it will become:: Asimov, Isaac/The Foundation/The Foundation - Isaac Asimov -You can use all the various metadata fields available in calibre in a template, including any custom columns you have created yourself. To find out the template name for a column simply hover your mouse over the column header. Names for custom fields (columns you have created yourself) always have a # as the first character. For series type custom fields, there is always an additional field named ``#seriesname_index`` that becomes the series index for that series. So if you have a custom series field named #myseries, there will also be a field named #myseries_index. +You can use all the various metadata fields available in calibre in a template, including any custom columns you have created yourself. To find out the template name for a column simply hover your mouse over the column header. Names for custom fields (columns you have created yourself) always have a # as the first character. For series type custom fields, there is always an additional field named ``#seriesname_index`` that becomes the series index for that series. So if you have a custom series field named ``#myseries``, there will also be a field named ``#myseries_index``. In addition to the column based fields, you also can use:: {formats} - A list of formats available in the calibre library for a book {isbn} - The ISBN number of the book -If a particular book does not have a particular piece of metadata, the field in the template is automatically removed for that book. So for example:: +If a particular book does not have a particular piece of metadata, the field in the template is automatically removed for that book. Consider, for example:: {author_sort}/{series}/{title} {series_index} @@ -44,19 +44,19 @@ Advanced formatting You can do more than just simple substitution with the templates. You can also conditionally include text and control how the substituted data is formatted. -First, conditionally including text. There are cases where you might want to have text appear in the output only if a field is not empty. A common case is series and series_index, where you want either nothing or the two values with a hyphen between them. Calibre handles this case using a special field syntax. +First, conditionally including text. There are cases where you might want to have text appear in the output only if a field is not empty. A common case is ``series`` and ``series_index``, where you want either nothing or the two values with a hyphen between them. Calibre handles this case using a special field syntax. For example, assume you want to use the template:: {series} - {series_index} - {title} -If the book has no series, the answer will be '- - title'. Many people would rather the result be simply 'title', without the hyphens. To do this, use the extended syntax ``{field:|prefix_text|suffix_text}``. When you use this syntax, if field has the value SERIES then the result will be prefix_textSERIESsuffix_text. If field has no value, then the result will be the empty string (nothing). The prefix and suffix can contain blanks. +If the book has no series, the answer will be ``- - title``. Many people would rather the result be simply ``title``, without the hyphens. To do this, use the extended syntax ``{field:|prefix_text|suffix_text}``. When you use this syntax, if field has the value SERIES then the result will be ``prefix_textSERIESsuffix_text``. If field has no value, then the result will be the empty string (nothing); the prefix and suffix are ignored. The prefix and suffix can contain blanks. Using this syntax, we can solve the above series problem with the template:: {series}{series_index:| - | - }{title} -The hyphens will be included only if the book has a series index. +The hyphens will be included only if the book has a series index, which it will have only if it has a series. Notes: you must include the : character if you want to use a prefix or a suffix. You must either use no \| characters or both of them; using one, as in ``{field:| - }``, is not allowed. It is OK not to provide any text for one side or the other, such as in ``{series:|| - }``. Using ``{title:||}`` is the same as using ``{title}``. @@ -85,7 +85,7 @@ Advanced features Using templates in custom columns ---------------------------------- -There are sometimes cases where you want to display metadata that |app| does not normally display, or to display data in a way different from how |app| normally does. For example, you might want to display the ISBN, a field that |app| does not display. You can use custom columns for this. To do so, you create a column with the type 'column built from other columns' (hereafter called composite columns), enter a template, and |app| will display in the column the result of evaluating that template. To display the isbn, create the column and enter ``{isbn}`` into the template box. To display a column containing the values of two series custom columns separated by a comma, use ``{#series1:||,}{#series2}``. +There are sometimes cases where you want to display metadata that |app| does not normally display, or to display data in a way different from how |app| normally does. For example, you might want to display the ISBN, a field that |app| does not display. You can use custom columns for this by creating a column with the type 'column built from other columns' (hereafter called composite columns), and entering a template. Result: |app| will display a column showing the result of evaluating that template. To display the ISBN, create the column and enter ``{isbn}`` into the template box. To display a column containing the values of two series custom columns separated by a comma, use ``{#series1:||,}{#series2}``. Composite columns can use any template option, including formatting. @@ -98,7 +98,7 @@ Suppose you want to display the value of a field in upper case, when that field Function references replace the formatting specification, going after the : and before the first ``|`` or the closing ``}``. Functions must always end with ``()``. Some functions take extra values (arguments), and these go inside the ``()``. -The syntax for using functions is ``{field:function(arguments)}``, or ``{field:function(arguments)|prefix|suffix}``. Argument values cannot contain a comma, because it is used to separate arguments. Functions return the value of the field used in the template, suitably modified. +The syntax for using functions is ``{field:function(arguments)}``, or ``{field:function(arguments)|prefix|suffix}``. Argument values cannot contain a comma, because it is used to separate arguments. The last (or only) argument cannot contain a closing parenthesis ( ')' ). Functions return the value of the field used in the template, suitably modified. The functions available are: From cf6f251b740d8601c80e4e3e4a28ad736ebff7d2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 19:41:43 +0100 Subject: [PATCH 126/235] Added dirty bit cache --- src/calibre/gui2/ui.py | 1 + src/calibre/library/database2.py | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 88a8c68572..6b04f6fa1f 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -533,6 +533,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ # Save the current field_metadata for applications like calibre2opds # Goes here, because if cf is valid, db is valid. db.prefs['field_metadata'] = db.field_metadata.all_metadata() + db.commit_dirty_cache() if DEBUG and db.gm_count > 0: print 'get_metadata cache: {0:d} calls, {1:4.2f}% misses'.format( db.gm_count, (db.gm_missed*100.0)/db.gm_count) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 4775e13818..c4d2666dd1 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -340,6 +340,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): setattr(self, 'title_sort', functools.partial(self.get_property, loc=self.FIELD_MAP['sort'])) + self.dirtied_cache = set() d = self.conn.get('SELECT book FROM metadata_dirtied', all=True) for x in d: self.dirtied_queue.put(x[0]) @@ -585,12 +586,20 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if remove_from_dirtied: self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,)) + # if a later exception prevents the commit, then the dirtied + # table will still have the book. No big deal, because the OPF + # is there and correct. We will simply do it again on next + # start + self.dirtied_cache.discard(book_id) if commit: self.conn.commit() return True def dirtied(self, book_ids, commit=True): for book in book_ids: + if book in self.dirtied_cache: + print 'in dirty cache', book + continue try: self.conn.execute( 'INSERT INTO metadata_dirtied (book) VALUES (?)', @@ -598,10 +607,30 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.dirtied_queue.put(book) except IntegrityError: # Already in table - continue + pass + # If the commit doesn't happen, then our cache will be wrong. This + # could lead to a problem because we won't put the book back into + # the dirtied table. We deal with this by writing the dirty cache + # back to the table on GUI exit. Not perfect, but probably OK + self.dirtied_cache.add(book) + print 'added book', book if commit: self.conn.commit() + def commit_dirty_cache(self): + ''' + Set the dirty indication for every book in the cache. The vast majority + of the time, the indication will already be set. However, sometimes + exceptions may have prevented a commit, which may remove some dirty + indications from the DB. This call will put them back. Note that there + is no problem with setting a dirty indication for a book that isn't in + fact dirty. Just wastes a few cycles. + ''' + print 'commit cache' + book_ids = list(self.dirtied_cache) + self.dirtied_cache = set() + self.dirtied(book_ids) + def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' Convenience method to return metadata as a :class:`Metadata` object. From b2b5e20c8f8c8a48eae23b288be7f347e09c0441 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 24 Sep 2010 13:51:22 -0600 Subject: [PATCH 127/235] Fourth beta --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 4c372c63a5..be387d8ca2 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.7.902' +__version__ = '0.7.903' __author__ = "Kovid Goyal " import re From 02ce96cd688d14ba0b26bd4448d71d22ac704119 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 20:46:45 -0600 Subject: [PATCH 128/235] Throttle OPF writer thread some more and framework for restore from OPFs --- src/calibre/library/caches.py | 2 +- src/calibre/library/database2.py | 49 ++++--- src/calibre/library/restore.py | 190 +++++++++++++++++++++++++ src/calibre/utils/pyconsole/console.py | 2 +- 4 files changed, 223 insertions(+), 20 deletions(-) create mode 100644 src/calibre/library/restore.py diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 1e52350e46..235584b9f7 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -48,7 +48,7 @@ class MetadataBackup(Thread): # {{{ time.sleep(2) if not self.dump_func([id_]): prints('Failed to backup metadata for id:', id_, 'again, giving up') - time.sleep(0.2) # Limit to five per second + time.sleep(0.9) # Limit to one per second # }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 94550f2804..ee7c3206bf 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -1198,38 +1198,41 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): else: raise if mi.title: - self.set_title(id, mi.title) + self.set_title(id, mi.title, commit=False) if not mi.authors: mi.authors = [_('Unknown')] authors = [] for a in mi.authors: authors += string_to_authors(a) - self.set_authors(id, authors, notify=False) + self.set_authors(id, authors, notify=False, commit=False) if mi.author_sort: - doit(self.set_author_sort, id, mi.author_sort, notify=False) + doit(self.set_author_sort, id, mi.author_sort, notify=False, + commit=False) if mi.publisher: - doit(self.set_publisher, id, mi.publisher, notify=False) + doit(self.set_publisher, id, mi.publisher, notify=False, + commit=False) if mi.rating: - doit(self.set_rating, id, mi.rating, notify=False) + doit(self.set_rating, id, mi.rating, notify=False, commit=False) if mi.series: - doit(self.set_series, id, mi.series, notify=False) + doit(self.set_series, id, mi.series, notify=False, commit=False) if mi.cover_data[1] is not None: doit(self.set_cover, id, mi.cover_data[1]) # doesn't use commit elif mi.cover is not None and os.access(mi.cover, os.R_OK): doit(self.set_cover, id, open(mi.cover, 'rb')) if mi.tags: - doit(self.set_tags, id, mi.tags, notify=False) + doit(self.set_tags, id, mi.tags, notify=False, commit=False) if mi.comments: - doit(self.set_comment, id, mi.comments, notify=False) + doit(self.set_comment, id, mi.comments, notify=False, commit=False) if mi.isbn and mi.isbn.strip(): - doit(self.set_isbn, id, mi.isbn, notify=False) + doit(self.set_isbn, id, mi.isbn, notify=False, commit=False) if mi.series_index: - doit(self.set_series_index, id, mi.series_index, notify=False) + doit(self.set_series_index, id, mi.series_index, notify=False, + commit=False) if mi.pubdate: - doit(self.set_pubdate, id, mi.pubdate, notify=False) + doit(self.set_pubdate, id, mi.pubdate, notify=False, commit=False) if getattr(mi, 'timestamp', None) is not None: - doit(self.set_timestamp, id, mi.timestamp, notify=False) - self.set_path(id, True) + doit(self.set_timestamp, id, mi.timestamp, notify=False, + commit=False) user_mi = mi.get_all_user_metadata(make_copy=False) for key in user_mi.iterkeys(): @@ -1238,7 +1241,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): doit(self.set_custom, id, val=mi.get(key), extra=mi.get_extra(key), - label=user_mi[key]['label']) + label=user_mi[key]['label'], commit=False) + self.commit() self.notify('metadata', [id]) def authors_sort_strings(self, id, index_is_id=False): @@ -1929,7 +1933,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): else: mi.tags.append(tag) - def create_book_entry(self, mi, cover=None, add_duplicates=True): + def create_book_entry(self, mi, cover=None, add_duplicates=True, + force_id=None): self._add_newbook_tag(mi) if not add_duplicates and self.has_book(mi): return None @@ -1940,9 +1945,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): aus = aus.decode(preferred_encoding, 'replace') if isbytestring(title): title = title.decode(preferred_encoding, 'replace') - obj = self.conn.execute('INSERT INTO books(title, series_index, author_sort) VALUES (?, ?, ?)', - (title, series_index, aus)) - id = obj.lastrowid + if force_id is None: + obj = self.conn.execute('INSERT INTO books(title, series_index, author_sort) VALUES (?, ?, ?)', + (title, series_index, aus)) + id = obj.lastrowid + else: + id = force_id + obj = self.conn.execute( + 'INSERT INTO books(id, title, series_index, ' + 'author_sort) VALUES (?, ?, ?, ?)', + (id, title, series_index, aus)) + self.data.books_added([id], self) self.set_path(id, True) self.conn.commit() diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py new file mode 100644 index 0000000000..bdbb5e314a --- /dev/null +++ b/src/calibre/library/restore.py @@ -0,0 +1,190 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import re, os, traceback, shutil +from threading import Thread +from operator import itemgetter +from textwrap import TextWrapper + +from calibre.ptempfile import TemporaryDirectory +from calibre.ebooks.metadata.opf2 import OPF +from calibre.library.database2 import LibraryDatabase2 +from calibre.constants import filesystem_encoding +from calibre import isbytestring + +NON_EBOOK_EXTENSIONS = frozenset([ + 'jpg', 'jpeg', 'gif', 'png', 'bmp', + 'opf', 'swp', 'swo' + ]) + +class RestoreDatabase(LibraryDatabase2): + + def set_path(self, book_id, *args, **kwargs): + pass + +class Restore(Thread): + + def __init__(self, library_path, progress_callback=None): + if isbytestring(library_path): + library_path = library_path.decode(filesystem_encoding) + self.src_library_path = os.path.abspath(library_path) + self.progress_callback = progress_callback + self.db_id_regexp = re.compile(r'^.* \((\d+)\)$') + self.bad_ext_pat = re.compile(r'[^a-z]+') + if not callable(self.progress_callback): + self.progress_callback = lambda x, y: x + self.dirs = [] + self.ignored_dirs = [] + self.failed_dirs = [] + self.books = [] + self.conflicting_custom_cols = {} + self.failed_restores = [] + + @property + def errors_occurred(self): + return self.failed_dirs or \ + self.conflicting_custom_cols or self.failed_restores + + @property + def report(self): + ans = '' + failures = list(self.failed_dirs) + [(x['dirpath'], tb) for x, tb in + self.failed_restores] + if failures: + ans += 'Failed to restore the books in the following folders:\n' + wrap = TextWrapper(initial_indent='\t\t', width=85) + for dirpath, tb in failures: + ans += '\t' + dirpath + ' with error:\n' + ans += wrap.fill(tb) + ans += '\n' + + if self.conflicting_custom_cols: + ans += '\n\n' + ans += 'The following custom columns were not fully restored:\n' + for x in self.conflicting_custom_cols: + ans += '\t#'+x+'\n' + + return ans + + + def run(self): + with TemporaryDirectory('_library_restore') as tdir: + self.library_path = tdir + self.scan_library() + self.create_cc_metadata() + self.restore_books() + self.replace_db() + + def scan_library(self): + for dirpath, dirnames, filenames in os.walk(self.src_library_path): + leaf = os.path.basename(dirpath) + m = self.db_id_regexp.search(leaf) + if m is None or 'metadata.opf' not in filenames: + self.ignored_dirs.append(dirpath) + continue + self.dirs.append((dirpath, filenames, m.group(1))) + + self.progress_callback(None, len(self.dirs)) + for i, x in enumerate(self.dirs): + dirpath, filenames, book_id = x + try: + self.process_dir(dirpath, filenames, book_id) + except: + self.failed_dirs.append((dirpath, traceback.format_exc())) + self.progress_callback(_('Processed') + repr(dirpath), i+1) + + def is_ebook_file(self, filename): + ext = os.path.splitext(filename)[1] + if not ext: + return False + ext = ext[1:].lower() + if ext in NON_EBOOK_EXTENSIONS or \ + self.bad_ext_pat.search(ext) is not None: + return False + return True + + def process_dir(self, dirpath, filenames, book_id): + formats = filter(self.is_ebook_file, filenames) + fmts = [os.path.splitext(x)[1][1:].upper() for x in formats] + sizes = [os.path.getsize(os.path.join(dirpath, x)) for x in formats] + names = [os.path.splitext(x)[0] for x in formats] + opf = os.path.join(dirpath, 'metadata.opf') + mi = OPF(opf).to_book_metadata() + timestamp = os.path.getmtime(opf) + path = os.path.relpath(dirpath, self.src_library_path).replace(os.sep, + '/') + + self.books.append({ + 'mi': mi, + 'timestamp': timestamp, + 'formats': list(zip(fmts, sizes, names)), + 'id': int(book_id), + 'dirpath': dirpath, + 'path': path, + }) + + def create_cc_metadata(self): + self.books.sort(key=itemgetter('timestamp')) + m = {} + fields = ('label', 'name', 'datatype', 'is_multiple', 'editable', + 'display') + for b in self.books: + args = [] + for x in fields: + if x in b: + args.append(b[x]) + if len(args) == len(fields): + # TODO: Do series type columns need special handling? + label = b['label'] + if label in m and args != m[label]: + if label not in self.conflicting_custom_cols: + self.conflicting_custom_cols[label] = set([m[label]]) + self.conflicting_custom_cols[label].add(args) + m[b['label']] = args + + db = LibraryDatabase2(self.library_path) + for args in m.values(): + db.create_custom_column(*args) + db.conn.close() + + def restore_books(self): + self.progress_callback(None, len(self.books)) + self.books.sort(key=itemgetter('id')) + + db = RestoreDatabase(self.library_path) + + for i, book in enumerate(self.books): + try: + self.restore_book(book, db) + except: + self.failed_restores.append((book, traceback.format_exc())) + self.progress_callback(book['mi'].title, i+1) + + db.conn.close() + + def restore_book(self, book, db): + db.create_book_entry(book['mi'], add_duplicates=True, + force_id=book['id']) + db.conn.execute('UPDATE books SET path=? WHERE id=?', (book['path'], + book['id'])) + + for fmt, size, name in book['formats']: + db.conn.execute(''' + INSERT INTO data (book,format,uncompressed_size,name) + VALUES (?,?,?,?)''', (id, fmt, size, name)) + db.conn.commit() + + def replace_db(self): + dbpath = os.path.join(self.src_library_path, 'metadata.db') + ndbpath = os.path.join(self.library_path, 'metadata.db') + + save_path = os.path.splitext(dbpath)[0]+'_pre_restore.db' + if os.path.exists(save_path): + os.remove(save_path) + os.rename(dbpath, save_path) + shutil.copyfile(ndbpath, dbpath) + diff --git a/src/calibre/utils/pyconsole/console.py b/src/calibre/utils/pyconsole/console.py index 14670fdb59..13c22a928f 100644 --- a/src/calibre/utils/pyconsole/console.py +++ b/src/calibre/utils/pyconsole/console.py @@ -171,7 +171,7 @@ class Console(QTextEdit): def shutdown(self): dynamic.set('console_history', self.history.serialize()) - self.shutton_down = True + self.shutting_down = True for c in self.controllers: c.kill() From 42ec47607c9d4272bf23b122d865e7c2c7c7aad9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 21:22:59 -0600 Subject: [PATCH 129/235] Create restore command for calibredb --- src/calibre/library/cli.py | 48 +++++++++++++++++++++++++++++++++- src/calibre/library/restore.py | 22 +++++++++++----- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index 6ff17b0781..1d81ac2bd6 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -877,8 +877,54 @@ def command_saved_searches(args, dbpath): COMMANDS = ('list', 'add', 'remove', 'add_format', 'remove_format', 'show_metadata', 'set_metadata', 'export', 'catalog', 'saved_searches', 'add_custom_column', 'custom_columns', - 'remove_custom_column', 'set_custom') + 'remove_custom_column', 'set_custom', 'restore_database') +def restore_database_option_parser(): + parser = get_parser(_( + ''' + %prog restore_database [options] + + Restore this database from the metadata stored in OPF + files in each directory of the calibre library. This is + useful if your metadata.db file has been corrupted. + + WARNING: This completely regenrates your datbase. You will + lose stored per-book conversion settings and custom recipes. + ''')) + return parser + +def command_restore_database(args, dbpath): + from calibre.library.restore import Restore + parser = saved_searches_option_parser() + opts, args = parser.parse_args(args) + if len(args) != 0: + parser.print_help() + return 1 + + class Progress(object): + def __init__(self): self.total = 1 + + def __call__(self, msg, step): + if msg is None: + self.total = float(step) + else: + prints(msg, '...', '%d%%'%int(100*(step/self.total))) + r = Restore(dbpath, progress_callback=Progress()) + r.start() + r.join() + + if r.tb is not None: + prints('Restoring database failed with error:') + prints(r.tb) + else: + prints('Restoring database succeeded') + if r.errors_occurred: + name = 'calibre_db_restore_report.txt' + open('calibre_db_restore_report.txt', + 'wb').write(r.report.encode('utf-8')) + prints('Some errors occurred. A detailed report was ' + 'saved to', name) + send_message() def option_parser(): parser = OptionParser(_( diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index bdbb5e314a..0381366810 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -23,12 +23,16 @@ NON_EBOOK_EXTENSIONS = frozenset([ class RestoreDatabase(LibraryDatabase2): - def set_path(self, book_id, *args, **kwargs): + def set_path(self, *args, **kwargs): + pass + + def dirtied(self, *args, **kwargs): pass class Restore(Thread): def __init__(self, library_path, progress_callback=None): + super(Restore, self).__init__() if isbytestring(library_path): library_path = library_path.decode(filesystem_encoding) self.src_library_path = os.path.abspath(library_path) @@ -43,6 +47,7 @@ class Restore(Thread): self.books = [] self.conflicting_custom_cols = {} self.failed_restores = [] + self.tb = None @property def errors_occurred(self): @@ -72,12 +77,15 @@ class Restore(Thread): def run(self): - with TemporaryDirectory('_library_restore') as tdir: - self.library_path = tdir - self.scan_library() - self.create_cc_metadata() - self.restore_books() - self.replace_db() + try: + with TemporaryDirectory('_library_restore') as tdir: + self.library_path = tdir + self.scan_library() + self.create_cc_metadata() + self.restore_books() + self.replace_db() + except: + self.tb = traceback.format_exc() def scan_library(self): for dirpath, dirnames, filenames in os.walk(self.src_library_path): From 5b8a645050f14de906e7c4a83b4440b7de0a0c99 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 22:38:19 -0600 Subject: [PATCH 130/235] Move backup I/O into backup thread from GUI thread to prevent GUI slowdown when the calibre library is on a slow device like a network share --- src/calibre/library/caches.py | 30 +++++++++++++++++++++++++----- src/calibre/library/database2.py | 13 +++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 235584b9f7..8261ca40fb 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -28,6 +28,7 @@ class MetadataBackup(Thread): # {{{ self.daemon = True self.db = db self.dump_func = dump_func + self.dump_queue = Queue() self.keep_running = True def stop(self): @@ -42,13 +43,32 @@ class MetadataBackup(Thread): # {{{ except: # Happens during interpreter shutdown break - if self.dump_func([id_]) is None: + if self.dump_func([id_], dump_queue=self.dump_queue) is None: # An exception occurred in dump_func, retry once - prints('Failed to backup metadata for id:', id_, 'once') + prints('Failed to get backup metadata for id:', id_, 'once') time.sleep(2) - if not self.dump_func([id_]): - prints('Failed to backup metadata for id:', id_, 'again, giving up') - time.sleep(0.9) # Limit to one per second + if not self.dump_func([id_], dump_queue=self.dump_queue): + prints('Failed to get backup metadata for id:', id_, 'again, giving up') + while True: + try: + path, raw = self.dump_queue.get_nowait() + except: + break + else: + try: + with open(path, 'wb') as f: + f.write(raw) + except: + prints('Failed to write backup metadata for id:', id_, 'once') + time.sleep(2) + try: + with open(path, 'wb') as f: + f.write(raw) + except: + prints('Failed to write backup metadata for id:', id_, + 'again, giving up') + + time.sleep(0.2) # Limit to five per second # }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index ee7c3206bf..61c52cf6b7 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -566,7 +566,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def metadata_for_field(self, key): return self.field_metadata[key] - def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True): + def dump_metadata(self, book_ids=None, remove_from_dirtied=True, + commit=True, dump_queue=None): 'Write metadata for each record to an individual OPF file' if book_ids is None: book_ids = [x[0] for x in self.conn.get( @@ -580,9 +581,13 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # cover is set/removed mi.cover = 'cover.jpg' raw = metadata_to_opf(mi) - path = self.abspath(book_id, index_is_id=True) - with open(os.path.join(path, 'metadata.opf'), 'wb') as f: - f.write(raw) + path = os.path.join(self.abspath(book_id, index_is_id=True), + 'metadata.opf') + if dump_queue is None: + with open(path, 'wb') as f: + f.write(raw) + else: + dump_queue.put((path, raw)) if remove_from_dirtied: self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,)) From cdc5127fa40201a30a4c3a535cde335c990ac91d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 22:50:44 -0600 Subject: [PATCH 131/235] ... --- src/calibre/library/cli.py | 10 +++++++++- src/calibre/library/restore.py | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index 1d81ac2bd6..7f181edc38 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -10,7 +10,8 @@ Command line interface to the calibre database. import sys, os, cStringIO, re from textwrap import TextWrapper -from calibre import terminal_controller, preferred_encoding, prints +from calibre import terminal_controller, preferred_encoding, prints, \ + isbytestring from calibre.utils.config import OptionParser, prefs, tweaks from calibre.ebooks.metadata.meta import get_metadata from calibre.library.database2 import LibraryDatabase2 @@ -901,6 +902,12 @@ def command_restore_database(args, dbpath): parser.print_help() return 1 + if opts.library_path is not None: + dbpath = opts.library_path + + if isbytestring(dbpath): + dbpath = dbpath.decode(preferred_encoding) + class Progress(object): def __init__(self): self.total = 1 @@ -918,6 +925,7 @@ def command_restore_database(args, dbpath): prints(r.tb) else: prints('Restoring database succeeded') + prints('old database saved as', r.olddb) if r.errors_occurred: name = 'calibre_db_restore_report.txt' open('calibre_db_restore_report.txt', diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index 0381366810..63cd152ae9 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -61,7 +61,7 @@ class Restore(Thread): self.failed_restores] if failures: ans += 'Failed to restore the books in the following folders:\n' - wrap = TextWrapper(initial_indent='\t\t', width=85) + wrap = TextWrapper(initial_indent='\t\t', width=1085) for dirpath, tb in failures: ans += '\t' + dirpath + ' with error:\n' ans += wrap.fill(tb) @@ -103,7 +103,7 @@ class Restore(Thread): self.process_dir(dirpath, filenames, book_id) except: self.failed_dirs.append((dirpath, traceback.format_exc())) - self.progress_callback(_('Processed') + repr(dirpath), i+1) + self.progress_callback(_('Processed') + ' ' + dirpath, i+1) def is_ebook_file(self, filename): ext = os.path.splitext(filename)[1] @@ -183,14 +183,14 @@ class Restore(Thread): for fmt, size, name in book['formats']: db.conn.execute(''' INSERT INTO data (book,format,uncompressed_size,name) - VALUES (?,?,?,?)''', (id, fmt, size, name)) + VALUES (?,?,?,?)''', (book['id'], fmt, size, name)) db.conn.commit() def replace_db(self): dbpath = os.path.join(self.src_library_path, 'metadata.db') ndbpath = os.path.join(self.library_path, 'metadata.db') - save_path = os.path.splitext(dbpath)[0]+'_pre_restore.db' + save_path = self.olddb = os.path.splitext(dbpath)[0]+'_pre_restore.db' if os.path.exists(save_path): os.remove(save_path) os.rename(dbpath, save_path) From f208950bab4c8d483f50a7b36884c262162a9d24 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 22:53:27 -0600 Subject: [PATCH 132/235] ... --- src/calibre/library/restore.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index 63cd152ae9..83e6565937 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -8,7 +8,6 @@ __docformat__ = 'restructuredtext en' import re, os, traceback, shutil from threading import Thread from operator import itemgetter -from textwrap import TextWrapper from calibre.ptempfile import TemporaryDirectory from calibre.ebooks.metadata.opf2 import OPF @@ -61,11 +60,10 @@ class Restore(Thread): self.failed_restores] if failures: ans += 'Failed to restore the books in the following folders:\n' - wrap = TextWrapper(initial_indent='\t\t', width=1085) for dirpath, tb in failures: ans += '\t' + dirpath + ' with error:\n' - ans += wrap.fill(tb) - ans += '\n' + ans += '\n'.join('\t\t'+x for x in tb.splitlines()) + ans += '\n\n' if self.conflicting_custom_cols: ans += '\n\n' From fca7c92ca45d4e62bea2d5f8708e47b71d5c32f6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 22:58:29 -0600 Subject: [PATCH 133/235] ... --- src/calibre/library/cli.py | 1 - src/calibre/library/restore.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py index 7f181edc38..19bd56bf55 100644 --- a/src/calibre/library/cli.py +++ b/src/calibre/library/cli.py @@ -932,7 +932,6 @@ def command_restore_database(args, dbpath): 'wb').write(r.report.encode('utf-8')) prints('Some errors occurred. A detailed report was ' 'saved to', name) - send_message() def option_parser(): parser = OptionParser(_( diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index 83e6565937..48e66e508f 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -46,6 +46,7 @@ class Restore(Thread): self.books = [] self.conflicting_custom_cols = {} self.failed_restores = [] + self.successes = 0 self.tb = None @property @@ -81,6 +82,8 @@ class Restore(Thread): self.scan_library() self.create_cc_metadata() self.restore_books() + if self.successes == 0 and len(self.dirs) > 0: + raise Exception(('Something bad happened')) self.replace_db() except: self.tb = traceback.format_exc() @@ -183,6 +186,7 @@ class Restore(Thread): INSERT INTO data (book,format,uncompressed_size,name) VALUES (?,?,?,?)''', (book['id'], fmt, size, name)) db.conn.commit() + self.successes += 1 def replace_db(self): dbpath = os.path.join(self.src_library_path, 'metadata.db') From da949796b0630c049f29f4da0d45037204dc8c54 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 23:03:29 -0600 Subject: [PATCH 134/235] ... --- src/calibre/gui2/ui.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 6b04f6fa1f..1e7c7550f8 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -360,6 +360,10 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ def library_moved(self, newloc): if newloc is None: return + try: + olddb = self.library_view.model().db + except: + olddb = None db = LibraryDatabase2(newloc) self.library_path = newloc self.book_on_device(None, reset=True) @@ -380,6 +384,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ self.apply_named_search_restriction('') # reset restriction to null self.saved_searches_changed() # reload the search restrictions combo box self.apply_named_search_restriction(db.prefs['gui_restriction']) + if olddb is not None: + try: + olddb.conn.close() + except: + import traceback + traceback.print_exc() def set_window_title(self): self.setWindowTitle(__appname__ + u' - ||%s||'%self.iactions['Choose Library'].library_name()) From 2d406112a477d3b65e014e548252fefdaa806de5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 23:26:28 -0600 Subject: [PATCH 135/235] Grrr keep only the file write in the GUI thread not the other way around --- src/calibre/gui2/library/models.py | 2 +- src/calibre/library/caches.py | 64 ++++++++++++++++++------------ src/calibre/library/database2.py | 2 +- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index fe1701a918..01f597caf4 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -157,7 +157,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() self.metadata_backup = MetadataBackup(db, - FunctionDispatcher(self.db.dump_metadata)) + self.db.dump_metadata) self.metadata_backup.start() def refresh_cover(event, ids): if event == 'cover' and self.cover_cache is not None: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 8261ca40fb..e675c97c76 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -28,8 +28,9 @@ class MetadataBackup(Thread): # {{{ self.daemon = True self.db = db self.dump_func = dump_func - self.dump_queue = Queue() self.keep_running = True + from calibre.gui2 import FunctionDispatcher + self.do_write = FunctionDispatcher(self.write) def stop(self): self.keep_running = False @@ -43,32 +44,43 @@ class MetadataBackup(Thread): # {{{ except: # Happens during interpreter shutdown break - if self.dump_func([id_], dump_queue=self.dump_queue) is None: - # An exception occurred in dump_func, retry once - prints('Failed to get backup metadata for id:', id_, 'once') - time.sleep(2) - if not self.dump_func([id_], dump_queue=self.dump_queue): - prints('Failed to get backup metadata for id:', id_, 'again, giving up') - while True: - try: - path, raw = self.dump_queue.get_nowait() - except: - break - else: - try: - with open(path, 'wb') as f: - f.write(raw) - except: - prints('Failed to write backup metadata for id:', id_, 'once') - time.sleep(2) - try: - with open(path, 'wb') as f: - f.write(raw) - except: - prints('Failed to write backup metadata for id:', id_, - 'again, giving up') - time.sleep(0.2) # Limit to five per second + dump = [] + try: + self.dump_func([id_], dump_queue=dump) + except: + prints('Failed to get backup metadata for id:', id_, 'once') + import traceback + traceback.print_exc() + time.sleep(2) + dump = [] + try: + self.dump_func([id_], dump_queue=dump) + except: + prints('Failed to get backup metadata for id:', id_, 'again, giving up') + traceback.print_exc() + continue + try: + path, raw = dump[0] + except: + break + try: + self.do_write(path, raw) + except: + prints('Failed to write backup metadata for id:', id_, 'once') + time.sleep(2) + try: + self.do_write(path, raw) + except: + prints('Failed to write backup metadata for id:', id_, + 'again, giving up') + + time.sleep(0.5) # Limit to two per second + + def write(self, path, raw): + with open(path, 'wb') as f: + f.write(raw) + # }}} diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 61c52cf6b7..8c34510de4 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -587,7 +587,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): with open(path, 'wb') as f: f.write(raw) else: - dump_queue.put((path, raw)) + dump_queue.append((path, raw)) if remove_from_dirtied: self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,)) From 04ccd041e9b0abb5661c333d04e2da9a9e10b5e9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 23:35:12 -0600 Subject: [PATCH 136/235] ... --- src/calibre/gui2/library/models.py | 3 +-- src/calibre/library/caches.py | 13 +++++++++---- src/calibre/library/database2.py | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 01f597caf4..a2555cfc56 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -156,8 +156,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.cover_cache.stop() self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() - self.metadata_backup = MetadataBackup(db, - self.db.dump_metadata) + self.metadata_backup = MetadataBackup(db) self.metadata_backup.start() def refresh_cover(event, ids): if event == 'cover' and self.cover_cache is not None: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index e675c97c76..bc16681f81 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -22,12 +22,17 @@ from calibre.ebooks.metadata import title_sort from calibre import fit_image, prints class MetadataBackup(Thread): # {{{ + ''' + Continuously backup changed metadata into OPF files + in the book directory. This class runs in its own + thread and makes sure that the actual file write happens in the + GUI thread to prevent Windows' file locking from causing problems. + ''' - def __init__(self, db, dump_func): + def __init__(self, db): Thread.__init__(self) self.daemon = True self.db = db - self.dump_func = dump_func self.keep_running = True from calibre.gui2 import FunctionDispatcher self.do_write = FunctionDispatcher(self.write) @@ -47,7 +52,7 @@ class MetadataBackup(Thread): # {{{ dump = [] try: - self.dump_func([id_], dump_queue=dump) + self.db.dump_metadata([id_], dump_to=dump) except: prints('Failed to get backup metadata for id:', id_, 'once') import traceback @@ -55,7 +60,7 @@ class MetadataBackup(Thread): # {{{ time.sleep(2) dump = [] try: - self.dump_func([id_], dump_queue=dump) + self.db.dump_metadata([id_], dump_to=dump) except: prints('Failed to get backup metadata for id:', id_, 'again, giving up') traceback.print_exc() diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 8c34510de4..39770068bb 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -567,7 +567,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): return self.field_metadata[key] def dump_metadata(self, book_ids=None, remove_from_dirtied=True, - commit=True, dump_queue=None): + commit=True, dump_to=None): 'Write metadata for each record to an individual OPF file' if book_ids is None: book_ids = [x[0] for x in self.conn.get( @@ -583,11 +583,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): raw = metadata_to_opf(mi) path = os.path.join(self.abspath(book_id, index_is_id=True), 'metadata.opf') - if dump_queue is None: + if dump_to is None: with open(path, 'wb') as f: f.write(raw) else: - dump_queue.append((path, raw)) + dump_to.append((path, raw)) if remove_from_dirtied: self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,)) From 37eadd1c10c316ddb41cce51a7efc8b30487cb22 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 25 Sep 2010 23:37:21 -0600 Subject: [PATCH 137/235] ... --- src/calibre/library/database2.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 39770068bb..aeaed9b46e 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -568,7 +568,12 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True, dump_to=None): - 'Write metadata for each record to an individual OPF file' + ''' + Write metadata for each record to an individual OPF file + + :param dump_to: None or list. If list then instead of writing to file, + data is append to list + ''' if book_ids is None: book_ids = [x[0] for x in self.conn.get( 'SELECT book FROM metadata_dirtied', all=True)] From 14537228158d25572f1e9ca7aa67922cf31e44f2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 11:00:32 +0100 Subject: [PATCH 138/235] 1) Fix problem with editing bool custom column metadata 2) make on-send and manual metadata managment work with sonys --- src/calibre/devices/usbms/books.py | 31 +++++++++++++++++-- .../gui2/preferences/create_custom_column.py | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py index 13fcb90b49..915d937379 100644 --- a/src/calibre/devices/usbms/books.py +++ b/src/calibre/devices/usbms/books.py @@ -111,6 +111,12 @@ class CollectionsBookList(BookList): from calibre.devices.usbms.driver import debug_print debug_print('Starting get_collections:', prefs['manage_device_metadata']) debug_print('Renaming rules:', tweaks['sony_collection_renaming_rules']) + + # Complexity: we can use renaming rules only when using automatic + # management. Otherwise we don't always have the metadata to make the + # right decisions + use_renaming_rules = prefs['manage_device_metadata'] == 'on_connect' + collections = {} # This map of sets is used to avoid linear searches when testing for # book equality @@ -139,7 +145,16 @@ class CollectionsBookList(BookList): attrs = collection_attributes for attr in attrs: attr = attr.strip() - ign, val, orig_val, fm = book.format_field_extended(attr) + # If attr is device_collections, then we cannot use + # format_field, because we don't know the fields where the + # values came from. + if attr == 'device_collections': + doing_dc = True + val = book.device_collections # is a list + else: + doing_dc = False + ign, val, orig_val, fm = book.format_field_extended(attr) + if not val: continue if isbytestring(val): val = val.decode(preferred_encoding, 'replace') @@ -151,9 +166,15 @@ class CollectionsBookList(BookList): val = orig_val else: val = [val] + for category in val: is_series = False - if fm['is_custom']: # is a custom field + if doing_dc: + # Attempt to determine if this value is a series by + # comparing it to the series name. + if category == book.series: + is_series = True + elif fm['is_custom']: # is a custom field if fm['datatype'] == 'text' and len(category) > 1 and \ category[0] == '[' and category[-1] == ']': continue @@ -167,7 +188,11 @@ class CollectionsBookList(BookList): ('series' in collection_attributes and book.get('series', None) == category): is_series = True - cat_name = self.compute_category_name(attr, category, fm) + if use_renaming_rules: + cat_name = self.compute_category_name(attr, category, fm) + else: + cat_name = category + if cat_name not in collections: collections[cat_name] = [] collections_lpaths[cat_name] = set() diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index bec21270df..ebf33784d4 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -38,7 +38,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn): 'is_multiple':False}, 8:{'datatype':'bool', 'text':_('Yes/No'), 'is_multiple':False}, - 8:{'datatype':'composite', + 9:{'datatype':'composite', 'text':_('Column built from other columns'), 'is_multiple':False}, } From e3781d0f15e4b7fa9dec8f55348dae129172c52f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 12:38:34 +0100 Subject: [PATCH 139/235] 1) add force renumber series to custom series bulk editing 2) add clear series to both standard and custom series bulk editing --- src/calibre/gui2/custom_column_widgets.py | 44 +++++-- src/calibre/gui2/dialogs/metadata_bulk.py | 8 +- src/calibre/gui2/dialogs/metadata_bulk.ui | 137 +++++++++++++--------- 3 files changed, 124 insertions(+), 65 deletions(-) diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index 90abfc2474..1d265fea1e 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -452,9 +452,25 @@ class BulkSeries(BulkBase): self.name_widget = w self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] - self.widgets.append(QLabel(_('Automatically number books in this series'), parent)) - self.idx_widget=QCheckBox(parent) - self.widgets.append(self.idx_widget) + self.widgets.append(QLabel('', parent)) + w = QWidget(parent) + layout = QHBoxLayout(w) + layout.setContentsMargins(0, 0, 0, 0) + self.remove_series = QCheckBox(parent) + self.remove_series.setText(_('Remove series')) + layout.addWidget(self.remove_series) + self.idx_widget = QCheckBox(parent) + self.idx_widget.setText(_('Automatically number books')) + layout.addWidget(self.idx_widget) + self.force_number = QCheckBox(parent) + self.force_number.setText(_('Force numbers to start with ')) + layout.addWidget(self.force_number) + self.series_start_number = QSpinBox(parent) + self.series_start_number.setMinimum(1) + self.series_start_number.setProperty("value", 1) + layout.addWidget(self.series_start_number) + layout.addItem(QSpacerItem(20, 10, QSizePolicy.Expanding, QSizePolicy.Minimum)) + self.widgets.append(w) def initialize(self, book_id): self.idx_widget.setChecked(False) @@ -465,17 +481,27 @@ class BulkSeries(BulkBase): def getter(self): n = unicode(self.name_widget.currentText()).strip() i = self.idx_widget.checkState() - return n, i + f = self.force_number.checkState() + s = self.series_start_number.value() + r = self.remove_series.checkState() + return n, i, f, s, r def commit(self, book_ids, notify=False): - val, update_indices = self.gui_val - val = self.normalize_ui_val(val) - if val != '': + val, update_indices, force_start, at_value, clear = self.gui_val + val = '' if clear else self.normalize_ui_val(val) + if clear or val != '': extras = [] next_index = self.db.get_next_cc_series_num_for(val, num=self.col_id) + print 'cc commit next index', next_index for book_id in book_ids: + if clear: + extras.append(None) + continue if update_indices: - if tweaks['series_index_auto_increment'] == 'next': + if force_start: + s_index = at_value + at_value += 1 + elif tweaks['series_index_auto_increment'] == 'next': s_index = next_index next_index += 1 else: @@ -483,6 +509,8 @@ class BulkSeries(BulkBase): else: s_index = self.db.get_custom_extra(book_id, num=self.col_id, index_is_id=True) + if s_index is None: + s_index = 1.0 extras.append(s_index) self.db.set_custom_bulk(book_ids, val, extras=extras, num=self.col_id, notify=notify) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index b14390e001..9c83b3aee5 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -32,7 +32,7 @@ class Worker(Thread): remove, add, au, aus, do_aus, rating, pub, do_series, \ do_autonumber, do_remove_format, remove_format, do_swap_ta, \ do_remove_conv, do_auto_author, series, do_series_restart, \ - series_start_value, do_title_case = self.args + series_start_value, do_title_case, clear_series = self.args # first loop: do author and title. These will commit at the end of each # operation, because each operation modifies the file system. We want to @@ -75,6 +75,9 @@ class Worker(Thread): if pub: self.db.set_publisher(id, pub, notify=False, commit=False) + if clear_series: + self.db.set_series(id, '', notify=False, commit=False) + if do_series: if do_series_restart: next = series_start_value @@ -592,6 +595,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): rating = self.rating.value() pub = unicode(self.publisher.text()) do_series = self.write_series + clear_series = self.clear_series.isChecked() series = unicode(self.series.currentText()).strip() do_autonumber = self.autonumber_series.isChecked() do_series_restart = self.series_numbering_restarts.isChecked() @@ -606,7 +610,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): args = (remove, add, au, aus, do_aus, rating, pub, do_series, do_autonumber, do_remove_format, remove_format, do_swap_ta, do_remove_conv, do_auto_author, series, do_series_restart, - series_start_value, do_title_case) + series_start_value, do_title_case, clear_series) bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') %len(self.ids), parent=self) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index e03a59b7ea..60e24dbceb 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -225,61 +225,50 @@ - - - List of known series. You can add new series. - - - List of known series. You can add new series. - - - true - - - QComboBox::InsertAlphabetically - - - QComboBox::AdjustToContents - - - - - - - Remove &format: - - - remove_format - - - - - - - - - - true - - - - - - - &Swap title and author - - - - - - - Change title to title case - - - Force the title to be in title case. If both this and swap authors are checked, -title and author are swapped before the title case is set - - + + + + + List of known series. You can add new series. + + + List of known series. You can add new series. + + + true + + + QComboBox::InsertAlphabetically + + + QComboBox::AdjustToContents + + + + + + + If checked, the series will be cleared + + + Clear series + + + + + + + Qt::Horizontal + + + + 20 + 00 + + + + + @@ -339,6 +328,44 @@ from the value in the box + + + + Remove &format: + + + remove_format + + + + + + + + + + true + + + + + + + &Swap title and author + + + + + + + Change title to title case + + + Force the title to be in title case. If both this and swap authors are checked, +title and author are swapped before the title case is set + + + From 3e1cb3b5e08c98105f7ce1636f454619fdde3879 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 13:07:22 +0100 Subject: [PATCH 140/235] Make covercache and backup stoppable. --- src/calibre/gui2/library/models.py | 2 ++ src/calibre/library/caches.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index a2555cfc56..ef251a884a 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -156,6 +156,8 @@ class BooksModel(QAbstractTableModel): # {{{ self.cover_cache.stop() self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() + if self.metadata_backup is not None: + self.metadata_backup.stop() self.metadata_backup = MetadataBackup(db) self.metadata_backup.start() def refresh_cover(event, ids): diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index bc16681f81..8d449974a5 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -43,7 +43,7 @@ class MetadataBackup(Thread): # {{{ def run(self): while self.keep_running: try: - id_ = self.db.dirtied_queue.get() + id_ = self.db.dirtied_queue.get(True, 2) except Empty: continue except: @@ -122,7 +122,7 @@ class CoverCache(Thread): # {{{ def run(self): while self.keep_running: try: - id_ = self.load_queue.get() + id_ = self.load_queue.get(True, 2) except Empty: continue except: From c8dbd705467ed6d15bc443939c06997fcee5b91b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 13:48:30 +0100 Subject: [PATCH 141/235] metadata backup that gets metadata on the GUI thread, computes the OPF on a separate thread, then writes the file on the GUI thread. --- src/calibre/gui2/library/models.py | 1 + src/calibre/library/caches.py | 26 ++++++++++++++++++-------- src/calibre/library/database2.py | 23 +++++++++++++++++++++++ 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index ef251a884a..b908019bcb 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -89,6 +89,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.alignment_map = {} self.buffer_size = buffer self.cover_cache = None + self.metadata_backup = None self.bool_yes_icon = QIcon(I('ok.png')) self.bool_no_icon = QIcon(I('list_remove.png')) self.bool_blank_icon = QIcon(I('blank.png')) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 8d449974a5..7d8a8624a9 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -19,6 +19,7 @@ from calibre.utils.date import parse_date, now, UNDEFINED_DATE from calibre.utils.search_query_parser import SearchQueryParser from calibre.utils.pyparsing import ParseException from calibre.ebooks.metadata import title_sort +from calibre.ebooks.metadata.opf2 import metadata_to_opf from calibre import fit_image, prints class MetadataBackup(Thread): # {{{ @@ -36,6 +37,8 @@ class MetadataBackup(Thread): # {{{ self.keep_running = True from calibre.gui2 import FunctionDispatcher self.do_write = FunctionDispatcher(self.write) + self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump) + self.clear_dirtied = FunctionDispatcher(db.clear_dirtied) def stop(self): self.keep_running = False @@ -43,6 +46,7 @@ class MetadataBackup(Thread): # {{{ def run(self): while self.keep_running: try: + time.sleep(0.5) # Limit to two per second id_ = self.db.dirtied_queue.get(True, 2) except Empty: continue @@ -50,25 +54,27 @@ class MetadataBackup(Thread): # {{{ # Happens during interpreter shutdown break - dump = [] try: - self.db.dump_metadata([id_], dump_to=dump) + path, mi = self.get_metadata_for_dump(id_) except: prints('Failed to get backup metadata for id:', id_, 'once') import traceback traceback.print_exc() time.sleep(2) - dump = [] try: - self.db.dump_metadata([id_], dump_to=dump) + path, mi = self.get_metadata_for_dump(id_) except: prints('Failed to get backup metadata for id:', id_, 'again, giving up') traceback.print_exc() continue try: - path, raw = dump[0] + print 'now do metadata' + raw = metadata_to_opf(mi) except: - break + prints('Failed to convert to opf for id:', id_) + traceback.print_exc() + continue + try: self.do_write(path, raw) except: @@ -79,8 +85,12 @@ class MetadataBackup(Thread): # {{{ except: prints('Failed to write backup metadata for id:', id_, 'again, giving up') + continue - time.sleep(0.5) # Limit to two per second + try: + self.clear_dirtied([id_]) + except: + prints('Failed to clear dirtied for id:', id_) def write(self, path, raw): with open(path, 'wb') as f: @@ -106,7 +116,6 @@ class CoverCache(Thread): # {{{ self.keep_running = False def _image_for_id(self, id_): - time.sleep(0.050) # Limit 20/second to not overwhelm the GUI img = self.cover_func(id_, index_is_id=True, as_image=True) if img is None: img = QImage() @@ -122,6 +131,7 @@ class CoverCache(Thread): # {{{ def run(self): while self.keep_running: try: + time.sleep(0.050) # Limit 20/second to not overwhelm the GUI id_ = self.load_queue.get(True, 2) except Empty: continue diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index a6f3f286bc..e6587f06a2 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -566,6 +566,24 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def metadata_for_field(self, key): return self.field_metadata[key] + def clear_dirtied(self, book_ids=None): + ''' + Clear the dirtied indicator for the books. This is used when fetching + metadata, creating an OPF, and writing a file are separated into steps. + The last step is clearing the indicator + ''' + for book_id in book_ids: + if not self.data.has_id(book_id): + continue + self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', + (book_id,)) + # if a later exception prevents the commit, then the dirtied + # table will still have the book. No big deal, because the OPF + # is there and correct. We will simply do it again on next + # start + self.dirtied_cache.discard(book_id) + self.conn.commit() + def dump_metadata(self, book_ids=None, remove_from_dirtied=True, commit=True, dump_to=None): ''' @@ -638,6 +656,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.dirtied_cache = set() self.dirtied(book_ids) + def get_metadata_for_dump(self, idx): + path = os.path.join(self.abspath(idx, index_is_id=True), 'metadata.opf') + mi = self.get_metadata(idx, index_is_id=True) + return ((path, mi)) + def get_metadata(self, idx, index_is_id=False, get_cover=False): ''' Convenience method to return metadata as a :class:`Metadata` object. From 12f75ddaf86e89c03013c75531aa1b5f25f7409a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 13:56:31 +0100 Subject: [PATCH 142/235] Note why we don't do a join where we should. --- src/calibre/gui2/library/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index b908019bcb..ff6d8b70f0 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -155,10 +155,14 @@ class BooksModel(QAbstractTableModel): # {{{ self.database_changed.emit(db) if self.cover_cache is not None: self.cover_cache.stop() + # Would like to to a join here, but the thread might be waiting to + # do something on the GUI thread. Deadlock. self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() if self.metadata_backup is not None: self.metadata_backup.stop() + # Would like to to a join here, but the thread might be waiting to + # do something on the GUI thread. Deadlock. self.metadata_backup = MetadataBackup(db) self.metadata_backup.start() def refresh_cover(event, ids): From f6870bd14b6cdf9041401a7f7c2ac02385bb4ae1 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 14:06:56 +0100 Subject: [PATCH 143/235] Introduce scheduling opportunities into the backup thread --- src/calibre/library/caches.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 7d8a8624a9..a9ef6a4281 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -67,6 +67,11 @@ class MetadataBackup(Thread): # {{{ prints('Failed to get backup metadata for id:', id_, 'again, giving up') traceback.print_exc() continue + + # Give the GUI thread a chance to do something. Python threads don't + # have priorities, so this thread would naturally keep the processor + # until some scheduling event happens. The sleep makes such an event + time.sleep(0.010) try: print 'now do metadata' raw = metadata_to_opf(mi) @@ -75,6 +80,7 @@ class MetadataBackup(Thread): # {{{ traceback.print_exc() continue + time.sleep(0.010) # Give the GUI thread a chance to do something try: self.do_write(path, raw) except: @@ -87,6 +93,7 @@ class MetadataBackup(Thread): # {{{ 'again, giving up') continue + time.sleep(0.010) # Give the GUI thread a chance to do something try: self.clear_dirtied([id_]) except: From 66ed343b1185f4a42976be447cfe0313e5223803 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 14:51:25 +0100 Subject: [PATCH 144/235] 1) Remove a print statement 2) fix series formatting --- src/calibre/ebooks/metadata/book/base.py | 4 ++++ src/calibre/library/caches.py | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index fd7ce8a6c3..0526de96a0 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -455,6 +455,8 @@ class Metadata(object): res = format_date(res, cmeta['display'].get('date_format','dd MMM yyyy')) elif datatype == 'bool': res = _('Yes') if res else _('No') + elif datatype == 'float' and key.endswith('_index'): + res = self.format_series_index(res) return (name, unicode(res), orig_res, cmeta) if key in field_metadata and field_metadata[key]['kind'] == 'field': @@ -468,6 +470,8 @@ class Metadata(object): datatype = fmeta['datatype'] if key == 'authors': res = authors_to_string(res) + elif key == 'series_index': + res = self.format_series_index(res) elif datatype == 'text' and fmeta['is_multiple']: res = u', '.join(res) elif datatype == 'series' and series_with_index: diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index a9ef6a4281..74be3cd594 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -53,7 +53,7 @@ class MetadataBackup(Thread): # {{{ except: # Happens during interpreter shutdown break - + print 'doing id', id_ try: path, mi = self.get_metadata_for_dump(id_) except: @@ -71,16 +71,15 @@ class MetadataBackup(Thread): # {{{ # Give the GUI thread a chance to do something. Python threads don't # have priorities, so this thread would naturally keep the processor # until some scheduling event happens. The sleep makes such an event - time.sleep(0.010) + time.sleep(0.1) try: - print 'now do metadata' raw = metadata_to_opf(mi) except: prints('Failed to convert to opf for id:', id_) traceback.print_exc() continue - time.sleep(0.010) # Give the GUI thread a chance to do something + time.sleep(0.1) # Give the GUI thread a chance to do something try: self.do_write(path, raw) except: @@ -93,7 +92,7 @@ class MetadataBackup(Thread): # {{{ 'again, giving up') continue - time.sleep(0.010) # Give the GUI thread a chance to do something + time.sleep(0.1) # Give the GUI thread a chance to do something try: self.clear_dirtied([id_]) except: From 87020e38be2441b7352a9c04dc8587547fdc6f53 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 15:49:15 +0100 Subject: [PATCH 145/235] Ensure that cached Metadata copies contain valid cover info when get_metadata is called with get_cover = True --- src/calibre/library/database2.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index e6587f06a2..0943c86e43 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -670,6 +670,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi = self.data.get(idx, self.FIELD_MAP['all_metadata'], row_is_id = index_is_id) if mi is not None: + if get_cover and mi.cover is None: + mi.cover = self.cover(idx, index_is_id=index_is_id, as_path=True) return mi self.gm_missed += 1 From 88cb23d952bdb2578418808feb6cc823da000e16 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 15:54:29 +0100 Subject: [PATCH 146/235] Take out print statement --- src/calibre/library/caches.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 74be3cd594..cdf0c1fce6 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -53,7 +53,6 @@ class MetadataBackup(Thread): # {{{ except: # Happens during interpreter shutdown break - print 'doing id', id_ try: path, mi = self.get_metadata_for_dump(id_) except: From 04ca51333b6e5ad821dc8d2e9c9ec8122ff10dcc Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 Sep 2010 09:10:05 -0600 Subject: [PATCH 147/235] Fix path too long message when restoring db --- src/calibre/gui2/main.py | 3 +-- src/calibre/library/restore.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 24ba7ef47c..d736835fd6 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -233,8 +233,7 @@ class GuiRunner(QObject): def show_splash_screen(self): self.splash_pixmap = QPixmap() self.splash_pixmap.load(I('library.png')) - self.splash_screen = QSplashScreen(self.splash_pixmap, - Qt.SplashScreen) + self.splash_screen = QSplashScreen(self.splash_pixmap) self.splash_screen.showMessage(_('Starting %s: Loading books...') % __appname__) self.splash_screen.show() diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index 48e66e508f..ec50a39aa0 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -22,6 +22,8 @@ NON_EBOOK_EXTENSIONS = frozenset([ class RestoreDatabase(LibraryDatabase2): + PATH_LIMIT = 10 + def set_path(self, *args, **kwargs): pass From 1169eaef9959fab39d0631bbb77c6f86c3c23cd8 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 16:26:45 +0100 Subject: [PATCH 148/235] Fix problem trying to back up metadata for a deleted book Add a 'backup all' button --- src/calibre/gui2/preferences/misc.py | 6 ++++++ src/calibre/gui2/preferences/misc.ui | 11 +++++++++-- src/calibre/library/caches.py | 7 ++++++- src/calibre/library/database2.py | 7 +++++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py index eae79fdfc0..e749a6fb98 100644 --- a/src/calibre/gui2/preferences/misc.py +++ b/src/calibre/gui2/preferences/misc.py @@ -88,10 +88,16 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): r('enforce_cpu_limit', config, restart_required=True) self.device_detection_button.clicked.connect(self.debug_device_detection) self.compact_button.clicked.connect(self.compact) + self.button_all_books_dirty.clicked.connect(self.mark_dirty) self.button_open_config_dir.clicked.connect(self.open_config_dir) self.button_osx_symlinks.clicked.connect(self.create_symlinks) self.button_osx_symlinks.setVisible(isosx) + def mark_dirty(self): + db = self.gui.library_view.model().db + ids = [id for id in db.data.iterallids()] + db.dirtied(ids) + def debug_device_detection(self, *args): from calibre.gui2.preferences.device_debug import DebugDevice d = DebugDevice(self) diff --git a/src/calibre/gui2/preferences/misc.ui b/src/calibre/gui2/preferences/misc.ui index f8582a3675..573c61aba5 100644 --- a/src/calibre/gui2/preferences/misc.ui +++ b/src/calibre/gui2/preferences/misc.ui @@ -124,7 +124,14 @@ - + + + + Force saving metadata of all books + + + + Qt::Vertical @@ -132,7 +139,7 @@ 20 - 18 + 1000 diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index cdf0c1fce6..9d6f87324f 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -44,6 +44,7 @@ class MetadataBackup(Thread): # {{{ self.keep_running = False def run(self): + import traceback while self.keep_running: try: time.sleep(0.5) # Limit to two per second @@ -53,11 +54,11 @@ class MetadataBackup(Thread): # {{{ except: # Happens during interpreter shutdown break + try: path, mi = self.get_metadata_for_dump(id_) except: prints('Failed to get backup metadata for id:', id_, 'once') - import traceback traceback.print_exc() time.sleep(2) try: @@ -67,6 +68,10 @@ class MetadataBackup(Thread): # {{{ traceback.print_exc() continue + if mi is None: + self.clear_dirtied([id_]) + continue + # Give the GUI thread a chance to do something. Python threads don't # have priorities, so this thread would naturally keep the processor # until some scheduling event happens. The sleep makes such an event diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 0943c86e43..6f628d8454 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -657,8 +657,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.dirtied(book_ids) def get_metadata_for_dump(self, idx): - path = os.path.join(self.abspath(idx, index_is_id=True), 'metadata.opf') - mi = self.get_metadata(idx, index_is_id=True) + try: + path = os.path.join(self.abspath(idx, index_is_id=True), 'metadata.opf') + mi = self.get_metadata(idx, index_is_id=True) + except: + return ((None, None)) return ((path, mi)) def get_metadata(self, idx, index_is_id=False, get_cover=False): From 482990dd031ae247e433f503cee50a044d7c6180 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 Sep 2010 09:40:34 -0600 Subject: [PATCH 149/235] Ensure application_id from OPF matched id in dir name and actually fix path too long error --- src/calibre/library/restore.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index ec50a39aa0..89c7fe8395 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -119,6 +119,7 @@ class Restore(Thread): return True def process_dir(self, dirpath, filenames, book_id): + book_id = int(book_id) formats = filter(self.is_ebook_file, filenames) fmts = [os.path.splitext(x)[1][1:].upper() for x in formats] sizes = [os.path.getsize(os.path.join(dirpath, x)) for x in formats] @@ -129,14 +130,17 @@ class Restore(Thread): path = os.path.relpath(dirpath, self.src_library_path).replace(os.sep, '/') - self.books.append({ - 'mi': mi, - 'timestamp': timestamp, - 'formats': list(zip(fmts, sizes, names)), - 'id': int(book_id), - 'dirpath': dirpath, - 'path': path, - }) + if int(mi.application_id) == book_id: + self.books.append({ + 'mi': mi, + 'timestamp': timestamp, + 'formats': list(zip(fmts, sizes, names)), + 'id': book_id, + 'dirpath': dirpath, + 'path': path, + }) + else: + self.ignored_dirs.append(dirpath) def create_cc_metadata(self): self.books.sort(key=itemgetter('timestamp')) @@ -157,7 +161,7 @@ class Restore(Thread): self.conflicting_custom_cols[label].add(args) m[b['label']] = args - db = LibraryDatabase2(self.library_path) + db = RestoreDatabase(self.library_path) for args in m.values(): db.create_custom_column(*args) db.conn.close() From 2ea859906ded2ef2980502cccf07df1bb5d1f80c Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 16:40:46 +0100 Subject: [PATCH 150/235] Change text on backup button --- src/calibre/gui2/preferences/misc.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/preferences/misc.ui b/src/calibre/gui2/preferences/misc.ui index 573c61aba5..492540901d 100644 --- a/src/calibre/gui2/preferences/misc.ui +++ b/src/calibre/gui2/preferences/misc.ui @@ -127,7 +127,7 @@ - Force saving metadata of all books + Back up metadata of all books (while you are working) From 11ad2a2ecf7fbc55584cdc4d68e296ace64ef90b Mon Sep 17 00:00:00 2001 From: GRiker Date: Sun, 26 Sep 2010 09:03:25 -0700 Subject: [PATCH 151/235] GwR revert mobi writer for utf-8, breaks indexing --- src/calibre/ebooks/mobi/writer.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py index 80c1bf74eb..10f1ee32d6 100644 --- a/src/calibre/ebooks/mobi/writer.py +++ b/src/calibre/ebooks/mobi/writer.py @@ -1795,12 +1795,13 @@ class MobiWriter(object): self._oeb.log.debug('Index records dumped to', t) def _clean_text_value(self, text): - if not text: - text = u'(none)' - text = text.strip() - if not isinstance(text, unicode): - text = text.decode('utf-8', 'replace') - text = text.encode('ascii','replace') + if text is not None and text.strip() : + text = text.strip() + if not isinstance(text, unicode): + text = text.decode('utf-8', 'replace') + text = text.encode('utf-8') + else : + text = "(none)".encode('utf-8') return text def _add_to_ctoc(self, ctoc_str, record_offset): From 1cd78a56f29c110fb8601ab9ba63f3283f6828e7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 17:31:39 +0100 Subject: [PATCH 152/235] Fix problem where :0>3s produced a string of all zeros for null fields. Add a confirmation dialog to the backup pushbutton --- src/calibre/gui2/preferences/misc.py | 3 +++ src/calibre/gui2/preferences/misc.ui | 2 +- src/calibre/library/caches.py | 1 + src/calibre/utils/formatter.py | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py index e749a6fb98..e72a1921ef 100644 --- a/src/calibre/gui2/preferences/misc.py +++ b/src/calibre/gui2/preferences/misc.py @@ -97,6 +97,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): db = self.gui.library_view.model().db ids = [id for id in db.data.iterallids()] db.dirtied(ids) + info_dialog(self, _('Backup metadata'), + _('Metadata will be backed up while calibre is running, at the ' + 'rate of 30 books per minute.'), show=True) def debug_device_detection(self, *args): from calibre.gui2.preferences.device_debug import DebugDevice diff --git a/src/calibre/gui2/preferences/misc.ui b/src/calibre/gui2/preferences/misc.ui index 492540901d..adf2a15c16 100644 --- a/src/calibre/gui2/preferences/misc.ui +++ b/src/calibre/gui2/preferences/misc.ui @@ -127,7 +127,7 @@ - Back up metadata of all books (while you are working) + Back up metadata of all books diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 9d6f87324f..3e7f4d85ee 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -75,6 +75,7 @@ class MetadataBackup(Thread): # {{{ # Give the GUI thread a chance to do something. Python threads don't # have priorities, so this thread would naturally keep the processor # until some scheduling event happens. The sleep makes such an event + print 'do one' time.sleep(0.1) try: raw = metadata_to_opf(mi) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index 6fed4e157a..f95a6deee5 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -100,7 +100,7 @@ class TemplateFormatter(string.Formatter): val = func[1](self, val) else: val = func[1](self, val, *args) - else: + elif val: val = string.Formatter.format_field(self, val, fmt) if not val: return '' From a05448f7844d9f6f0730a4354b6c6e70dc8020ed Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 17:49:52 +0100 Subject: [PATCH 153/235] Fix stupid mistake in method naming in base.py --- src/calibre/ebooks/metadata/book/base.py | 21 +++++++-------------- src/calibre/gui2/library/models.py | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 0526de96a0..bdf11ad4ba 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -181,17 +181,10 @@ class Metadata(object): ''' return metadata describing a standard or custom field. ''' - if key in self.user_metadata_keys(): + if key not in self.custom_field_keys(): return self.get_standard_metadata(self, key, make_copy=False) return self.get_user_metadata(key, make_copy=False) - def user_metadata_keys(self): - ''' - Return the standard keys actually in this book. - ''' - _data = object.__getattribute__(self, '_data') - return frozenset(_data['user_metadata'].iterkeys()) - def all_non_none_fields(self): ''' Return a dictionary containing all non-None metadata fields, including @@ -305,7 +298,7 @@ class Metadata(object): def print_all_attributes(self): for x in STANDARD_METADATA_FIELDS: prints('%s:'%x, getattr(self, x, 'None')) - for x in self.user_metadata_keys(): + for x in self.custom_field_keys(): meta = self.get_user_metadata(x, make_copy=False) if meta is not None: prints(x, meta) @@ -370,8 +363,8 @@ class Metadata(object): if len(other_cover) > len(self_cover): self.cover_data = other.cover_data - if getattr(other, 'user_metadata_keys', None): - for x in other.user_metadata_keys(): + if getattr(other, 'custom_field_keys', None): + for x in other.custom_field_keys(): meta = other.get_user_metadata(x, make_copy=True) if meta is not None: self_tags = self.get(x, []) @@ -434,7 +427,7 @@ class Metadata(object): ''' returns the tuple (field_name, formatted_value) ''' - if key in self.user_metadata_keys(): + if key in self.custom_field_keys(): res = self.get(key, None) cmeta = self.get_user_metadata(key, make_copy=False) name = unicode(cmeta['name']) @@ -516,7 +509,7 @@ class Metadata(object): fmt('Published', isoformat(self.pubdate)) if self.rights is not None: fmt('Rights', unicode(self.rights)) - for key in self.user_metadata_keys(): + for key in self.custom_field_keys(): val = self.get(key, None) if val: (name, val) = self.format_field(key) @@ -541,7 +534,7 @@ class Metadata(object): ans += [(_('Published'), unicode(self.pubdate.isoformat(' ')))] if self.rights is not None: ans += [(_('Rights'), unicode(self.rights))] - for key in self.user_metadata_keys(): + for key in self.custom_field_keys(): val = self.get(key, None) if val: (name, val) = self.format_field(key) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index ff6d8b70f0..6725989ee5 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -331,7 +331,7 @@ class BooksModel(QAbstractTableModel): # {{{ _('Book %s of %s.')%\ (sidx, prepare_string_for_xml(series)) mi = self.db.get_metadata(idx) - for key in mi.user_metadata_keys(): + for key in mi.custom_field_keys(): name, val = mi.format_field(key) if val: data[name] = val From 10f9af93a9e2ec28938a2d855fc01247ab129960 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 18:18:45 +0100 Subject: [PATCH 154/235] Fix restoring custom column definitions --- src/calibre/library/caches.py | 1 - src/calibre/library/restore.py | 38 ++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 3e7f4d85ee..9d6f87324f 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -75,7 +75,6 @@ class MetadataBackup(Thread): # {{{ # Give the GUI thread a chance to do something. Python threads don't # have priorities, so this thread would naturally keep the processor # until some scheduling event happens. The sleep makes such an event - print 'do one' time.sleep(0.1) try: raw = metadata_to_opf(mi) diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index 89c7fe8395..d34e831fc7 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -145,25 +145,33 @@ class Restore(Thread): def create_cc_metadata(self): self.books.sort(key=itemgetter('timestamp')) m = {} - fields = ('label', 'name', 'datatype', 'is_multiple', 'editable', + fields = ('label', 'name', 'datatype', 'is_multiple', 'is_editable', 'display') for b in self.books: - args = [] - for x in fields: - if x in b: - args.append(b[x]) - if len(args) == len(fields): - # TODO: Do series type columns need special handling? - label = b['label'] - if label in m and args != m[label]: - if label not in self.conflicting_custom_cols: - self.conflicting_custom_cols[label] = set([m[label]]) - self.conflicting_custom_cols[label].add(args) - m[b['label']] = args + for key in b['mi'].custom_field_keys(): + cfm = b['mi'].metadata_for_field(key) + args = [] + for x in fields: + if x in cfm: + if x == 'is_multiple': + args.append(cfm[x] is not None) + else: + args.append(cfm[x]) + if len(args) == len(fields): + # TODO: Do series type columns need special handling? + label = cfm['label'] + if label in m and args != m[label]: + if label not in self.conflicting_custom_cols: + self.conflicting_custom_cols[label] = set([m[label]]) + self.conflicting_custom_cols[label].add(args) + m[cfm['label']] = args db = RestoreDatabase(self.library_path) - for args in m.values(): - db.create_custom_column(*args) + self.progress_callback(None, len(m)) + if len(m): + for i,args in enumerate(m.values()): + db.create_custom_column(*args) + self.progress_callback(_('creating custom column ')+args[0], i+1) db.conn.close() def restore_books(self): From 4f522bde37cffedc184f4ff1f70b8b56aed1962d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 18:25:45 +0100 Subject: [PATCH 155/235] Add dialog box back to the backup button --- src/calibre/gui2/preferences/misc.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py index 37887d56dc..99080c63bc 100644 --- a/src/calibre/gui2/preferences/misc.py +++ b/src/calibre/gui2/preferences/misc.py @@ -96,6 +96,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): def mark_dirty(self): db = self.gui.library_view.model().db db.dirtied(list(db.data.iterallids())) + info_dialog(self, _('Backup metadata'), + _('Metadata will be backed up while calibre is running, at the ' + 'rate of 30 books per minute.'), show=True) def debug_device_detection(self, *args): from calibre.gui2.preferences.device_debug import DebugDevice From 49561cd26c5f880a91e05025013dc8c8a7338d47 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 18:53:05 +0100 Subject: [PATCH 156/235] Change dirtied clear/set model in backup thread --- src/calibre/gui2/ui.py | 3 +++ src/calibre/library/caches.py | 12 +++++------ src/calibre/library/database2.py | 36 +++++++++++++++++++------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 1e7c7550f8..2082a3b90a 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -565,6 +565,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ mb = self.library_view.model().metadata_backup if mb is not None: mb.stop() + # give the thread time to stop so all operations complete + # otherwise the exit could kill the thread mid-write + time.sleep(2) self.hide_windows() self.emailer.stop() diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 7a15cb3ce1..09adc4a9fd 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -39,6 +39,7 @@ class MetadataBackup(Thread): # {{{ self.do_write = FunctionDispatcher(self.write) self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump) self.clear_dirtied = FunctionDispatcher(db.clear_dirtied) + self.set_dirtied = FunctionDispatcher(db.dirtied) def stop(self): self.keep_running = False @@ -68,8 +69,9 @@ class MetadataBackup(Thread): # {{{ traceback.print_exc() continue + # at this point the dirty indication is off + if mi is None: - self.clear_dirtied([id_]) continue # Give the GUI thread a chance to do something. Python threads don't @@ -79,6 +81,7 @@ class MetadataBackup(Thread): # {{{ try: raw = metadata_to_opf(mi) except: + self.set_dirtied([id_]) prints('Failed to convert to opf for id:', id_) traceback.print_exc() continue @@ -92,16 +95,11 @@ class MetadataBackup(Thread): # {{{ try: self.do_write(path, raw) except: + self.set_dirtied([id_]) prints('Failed to write backup metadata for id:', id_, 'again, giving up') continue - time.sleep(0.1) # Give the GUI thread a chance to do something - try: - self.clear_dirtied([id_]) - except: - prints('Failed to clear dirtied for id:', id_) - def write(self, path, raw): with open(path, 'wb') as f: f.write(raw) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index ce72b473e1..281f8cdc78 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -598,20 +598,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): for book_id in book_ids: if not self.data.has_id(book_id): continue - path, mi = self.get_metadata_for_dump(book_id) + path, mi = self.get_metadata_for_dump(book_id, + remove_from_dirtied=remove_from_dirtied) if path is None: continue - raw = metadata_to_opf(mi) - with open(path, 'wb') as f: - f.write(raw) - if remove_from_dirtied: - self.conn.execute('DELETE FROM metadata_dirtied WHERE book=?', - (book_id,)) - # if a later exception prevents the commit, then the dirtied - # table will still have the book. No big deal, because the OPF - # is there and correct. We will simply do it again on next - # start - self.dirtied_cache.discard(book_id) + try: + raw = metadata_to_opf(mi) + with open(path, 'wb') as f: + f.write(raw) + except: + # Something went wrong. Put the book back on the dirty list + self.dirtied([book_id]) if commit: self.conn.commit() return True @@ -649,7 +646,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.dirtied_cache = set() self.dirtied(book_ids) - def get_metadata_for_dump(self, idx): + def get_metadata_for_dump(self, idx, remove_from_dirtied=True): try: path = os.path.join(self.abspath(idx, index_is_id=True), 'metadata.opf') mi = self.get_metadata(idx, index_is_id=True) @@ -658,7 +655,18 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # cover is set/removed mi.cover = 'cover.jpg' except: - return (None, None) + # This almost certainly means that the book has been deleted while + # the backup operation sat in the queue. + path,mi = (None, None) + + try: + # clear the dirtied indicator. The user must put it back if + # something goes wrong with writing the OPF + if remove_from_dirtied: + self.clear_dirtied([idx]) + except: + # No real problem. We will just do it again. + pass return (path, mi) def get_metadata(self, idx, index_is_id=False, get_cover=False): From bfdcb4250d600e47a14e52001a4b0bb344a88547 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 19:07:08 +0100 Subject: [PATCH 157/235] Have get_metadata put id into Metadata. It should be there, because it is in field_metadata as a field type. It is not in STANDARD_FIELDS, so it won't be serialized. --- src/calibre/library/database2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 281f8cdc78..a9d372bed1 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -719,6 +719,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): mi.isbn = self.isbn(idx, index_is_id=index_is_id) id = idx if index_is_id else self.id(idx) mi.application_id = id + mi.id = id for key,meta in self.field_metadata.iteritems(): if meta['is_custom']: mi.set_user_metadata(key, meta) From 0f341f5cd57ed6c9346ec11f812057f7f399251e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 Sep 2010 12:28:35 -0600 Subject: [PATCH 158/235] Fifth beta --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index be387d8ca2..6cab1d32e7 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.7.903' +__version__ = '0.7.904' __author__ = "Kovid Goyal " import re From 8c2b672e6c086db3003f3f1e7ce2283d7c57da1d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 Sep 2010 12:30:19 -0600 Subject: [PATCH 159/235] ... --- resources/recipes/boortz.recipe | 15 +++++++-------- resources/recipes/popscience.recipe | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/resources/recipes/boortz.recipe b/resources/recipes/boortz.recipe index 0b52e0b9ca..8fb8041411 100644 --- a/resources/recipes/boortz.recipe +++ b/resources/recipes/boortz.recipe @@ -1,5 +1,4 @@ from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import BeautifulSoup, re class AdvancedUserRecipe1282101454(BasicNewsRecipe): title = 'Nealz Nuze' language = 'en' @@ -12,11 +11,11 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe): linearize_tables = True no_stylesheets = True remove_javascript = True - + masthead_url = 'http://boortz.com/images/nuze_logo.gif' keep_only_tags = [ dict(name='td', attrs={'id':['contentWellCell']}) - + ] remove_tags = [ dict(name='a', attrs={'class':['blogPermalink']}), @@ -26,13 +25,13 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe): remove_tags_after = [dict(name='div', attrs={'class':'blogEntryBody'}),] feeds = [ ('NUZE', 'http://boortz.com/nealz_nuze_rss/rss.xml') - + ] - - - - + + + + diff --git a/resources/recipes/popscience.recipe b/resources/recipes/popscience.recipe index 2bef7e4807..1527a1bb71 100644 --- a/resources/recipes/popscience.recipe +++ b/resources/recipes/popscience.recipe @@ -1,5 +1,5 @@ from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import BeautifulSoup, re +from calibre.ebooks.BeautifulSoup import re class AdvancedUserRecipe1282101454(BasicNewsRecipe): title = 'Popular Science' @@ -13,35 +13,35 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe): no_stylesheets = True remove_javascript = True use_embedded_content = True - + masthead_url = 'http://www.raytheon.com/newsroom/rtnwcm/groups/Public/documents/masthead/rtn08_popscidec_masthead.jpg' - - + + feeds = [ - + ('Gadgets', 'http://www.popsci.com/full-feed/gadgets'), ('Cars', 'http://www.popsci.com/full-feed/cars'), ('Science', 'http://www.popsci.com/full-feed/science'), ('Technology', 'http://www.popsci.com/full-feed/technology'), ('DIY', 'http://www.popsci.com/full-feed/diy'), - + ] - - #The following will get read of the Gallery: links when found - + + #The following will get read of the Gallery: links when found + def preprocess_html(self, soup) : print 'SOUP IS: ', soup weblinks = soup.findAll(['head','h2']) if weblinks is not None: for link in weblinks: if re.search('(Gallery)(:)',str(link)): - + link.parent.extract() return soup - #----------------------------------------------------------------- - - + #----------------------------------------------------------------- + + From f74530210fdde5a632c88d28f15b7beed9c8ef34 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Sun, 26 Sep 2010 21:01:55 +0100 Subject: [PATCH 160/235] Make composite columns sort case-insensitive. --- src/calibre/library/caches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 09adc4a9fd..6cd0c227dd 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -780,7 +780,7 @@ class SortKeyGenerator(object): sidx = record[sidx_fm['rec_index']] val = (val, sidx) - elif dt in ('text', 'comments'): + elif dt in ('text', 'comments', 'composite'): if val is None: val = '' val = val.lower() From c63b55115079ce06d516f2f21c8e75f580ecc118 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 26 Sep 2010 15:25:33 -0600 Subject: [PATCH 161/235] Shutdown the metadata backup thread before running a db integrity check --- src/calibre/gui2/library/models.py | 2 +- src/calibre/gui2/preferences/misc.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 6725989ee5..b2a7f08055 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -72,7 +72,7 @@ class BooksModel(QAbstractTableModel): # {{{ 'publisher' : _("Publisher"), 'tags' : _("Tags"), 'series' : _("Series"), - } + } def __init__(self, parent=None, buffer=40): QAbstractTableModel.__init__(self, parent) diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py index 99080c63bc..865115c2ed 100644 --- a/src/calibre/gui2/preferences/misc.py +++ b/src/calibre/gui2/preferences/misc.py @@ -106,8 +106,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): d.exec_() def compact(self, *args): - d = CheckIntegrity(self.gui.library_view.model().db, self) + from calibre.library.caches import MetadataBackup + m = self.gui.library_view.model() + if m.metadata_backup is not None: + m.metadata_backup.stop() + d = CheckIntegrity(m.db, self) d.exec_() + m.metadata_backup = MetadataBackup(m.db) + m.metadata_backup.start() def open_config_dir(self, *args): from calibre.utils.config import config_dir From 1dee223f14d413f5969e1ff7b261882b5779be0d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 27 Sep 2010 15:12:25 +0100 Subject: [PATCH 162/235] First implementation of plugboards --- src/calibre/customize/builtins.py | 15 +- src/calibre/ebooks/metadata/book/base.py | 29 ++- src/calibre/gui2/device.py | 32 ++- src/calibre/gui2/preferences/plugboard.py | 257 ++++++++++++++++++++++ src/calibre/gui2/preferences/plugboard.ui | 138 ++++++++++++ src/calibre/library/save_to_disk.py | 22 +- 6 files changed, 484 insertions(+), 9 deletions(-) create mode 100644 src/calibre/gui2/preferences/plugboard.py create mode 100644 src/calibre/gui2/preferences/plugboard.ui diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 4e47c70bb0..89c800afb2 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -796,6 +796,17 @@ class Sending(PreferencesPlugin): description = _('Control how calibre transfers files to your ' 'ebook reader') +class Plugboard(PreferencesPlugin): + name = 'Plugboard' + icon = I('plugboard.png') + gui_name = _('Metadata plugboard') + category = 'Import/Export' + gui_category = _('Import/Export') + category_order = 3 + name_order = 4 + config_widget = 'calibre.gui2.preferences.plugboard' + description = _('Change metadata fields before saving/sending') + class Email(PreferencesPlugin): name = 'Email' icon = I('mail.png') @@ -856,8 +867,8 @@ class Misc(PreferencesPlugin): description = _('Miscellaneous advanced configuration') plugins += [LookAndFeel, Behavior, Columns, Toolbar, InputOptions, - CommonOptions, OutputOptions, Adding, Saving, Sending, Email, Server, - Plugins, Tweaks, Misc] + CommonOptions, OutputOptions, Adding, Saving, Sending, Plugboard, + Email, Server, Plugins, Tweaks, Misc] #}}} diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index bf95e989e8..aaa7c78e9a 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -182,7 +182,7 @@ class Metadata(object): return metadata describing a standard or custom field. ''' if key not in self.custom_field_keys(): - return self.get_standard_metadata(self, key, make_copy=False) + return self.get_standard_metadata(key, make_copy=False) return self.get_user_metadata(key, make_copy=False) def all_non_none_fields(self): @@ -294,6 +294,33 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') _data['user_metadata'][field] = metadata + def copy_specific_attributes(self, other, attrs): + ''' + Takes a dict {src:dest, src:dest} and copys other[src] to self[dest]. + This is on a best-efforts basis. Some assignments can make no sense. + ''' + if not attrs: + return + for src in attrs: + try: + print src + sfm = other.metadata_for_field(src) + dfm = self.metadata_for_field(attrs[src]) + if dfm['is_multiple']: + if sfm['is_multiple']: + self.set(attrs[src], other.get(src)) + else: + self.set(attrs[src], + [f.strip() for f in other.get(src).split(',') + if f.strip()]) + elif sfm['is_multiple']: + self.set(attrs[src], ','.join(other.get(src))) + else: + self.set(attrs[src], other.get(src)) + except: + traceback.print_exc() + pass + # Old Metadata API {{{ def print_all_attributes(self): for x in STANDARD_METADATA_FIELDS: diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 58c5e5d9ad..eb1716f782 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -317,19 +317,40 @@ class DeviceManager(Thread): # {{{ args=[booklist, on_card], description=_('Send collections to device')) - def _upload_books(self, files, names, on_card=None, metadata=None): + def _upload_books(self, files, names, on_card=None, metadata=None, plugboards=None): '''Upload books to device: ''' if metadata and files and len(metadata) == len(files): for f, mi in zip(files, metadata): if isinstance(f, unicode): ext = f.rpartition('.')[-1].lower() + dev_name = self.connected_device.name + cpb = None + if ext in plugboards: + cpb = plugboards[ext] + elif ' any' in plugboards: + cpb = plugboards[' any'] + if cpb is not None: + if dev_name in cpb: + cpb = cpb[dev_name] + elif ' any' in plugboards[ext]: + cpb = cpb[' any'] + else: + cpb = None + + if DEBUG: + prints('Using plugboard', cpb) if ext: try: if DEBUG: prints('Setting metadata in:', mi.title, 'at:', f, file=sys.__stdout__) with open(f, 'r+b') as stream: - set_metadata(stream, mi, stream_type=ext) + if cpb: + newmi = mi.deepcopy() + newmi.copy_specific_attributes(mi, cpb) + else: + newmi = mi + set_metadata(stream, newmi, stream_type=ext) except: if DEBUG: prints(traceback.format_exc(), file=sys.__stdout__) @@ -338,12 +359,12 @@ class DeviceManager(Thread): # {{{ metadata=metadata, end_session=False) def upload_books(self, done, files, names, on_card=None, titles=None, - metadata=None): + metadata=None, plugboards=None): desc = _('Upload %d books to device')%len(names) if titles: desc += u':' + u', '.join(titles) return self.create_job(self._upload_books, done, args=[files, names], - kwargs={'on_card':on_card,'metadata':metadata}, description=desc) + kwargs={'on_card':on_card,'metadata':metadata,'plugboards':plugboards}, description=desc) def add_books_to_metadata(self, locations, metadata, booklists): self.device.add_books_to_metadata(locations, metadata, booklists) @@ -1257,10 +1278,11 @@ class DeviceMixin(object): # {{{ :param files: List of either paths to files or file like objects ''' titles = [i.title for i in metadata] + plugboards = self.library_view.model().db.prefs.get('plugboards', None) job = self.device_manager.upload_books( Dispatcher(self.books_uploaded), files, names, on_card=on_card, - metadata=metadata, titles=titles + metadata=metadata, titles=titles, plugboards=plugboards ) self.upload_memory[job] = (metadata, on_card, memory, files) diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py new file mode 100644 index 0000000000..5691120cef --- /dev/null +++ b/src/calibre/gui2/preferences/plugboard.py @@ -0,0 +1,257 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai + +__license__ = 'GPL v3' +__copyright__ = '2010, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from PyQt4 import QtGui + +from calibre.gui2 import error_dialog +from calibre.gui2.preferences import ConfigWidgetBase, test_widget, \ + AbortCommit +from calibre.gui2.preferences.plugboard_ui import Ui_Form +from calibre.customize.ui import metadata_writers, device_plugins + + +class ConfigWidget(ConfigWidgetBase, Ui_Form): + + def genesis(self, gui): + self.gui = gui + self.db = gui.library_view.model().db + self.current_plugboards = self.db.prefs.get('plugboards', {'epub': {' any': {'title':'authors', 'authors':'tags'}}}) + self.current_device = None + self.current_format = None +# self.proxy = ConfigProxy(config()) +# +# r = self.register +# +# for x in ('asciiize', 'update_metadata', 'save_cover', 'write_opf', +# 'replace_whitespace', 'to_lowercase', 'formats', 'timefmt'): +# r(x, self.proxy) +# +# self.save_template.changed_signal.connect(self.changed_signal.emit) + + def clear_fields(self, edit_boxes=False, new_boxes=False): + self.ok_button.setEnabled(False) + for w in self.source_widgets: + w.clear() + for w in self.dest_widgets: + w.clear() + if edit_boxes: + self.edit_device.setCurrentIndex(0) + self.edit_format.setCurrentIndex(0) + if new_boxes: + self.new_device.setCurrentIndex(0) + self.new_format.setCurrentIndex(0) + + def set_fields(self): + self.ok_button.setEnabled(True) + for w in self.source_widgets: + w.addItems(self.fields) + for w in self.dest_widgets: + w.addItems(self.fields) + + def set_field(self, i, src, dst): + print i, src, dst + idx = self.fields.index(src) + self.source_widgets[i].setCurrentIndex(idx) + idx = self.fields.index(dst) + self.dest_widgets[i].setCurrentIndex(idx) + + def edit_device_changed(self, txt): + if txt == '': + self.current_device = None + return + print 'edit device changed' + self.clear_fields(new_boxes=True) + self.current_device = unicode(txt) + fpb = self.current_plugboards.get(self.current_format, None) + if fpb is None: + print 'None format!' + return + dpb = fpb.get(self.current_device, None) + if dpb is None: + print 'none device!' + return + self.set_fields() + for i,src in enumerate(dpb): + self.set_field(i, src, dpb[src]) + self.ok_button.setEnabled(True) + + def edit_format_changed(self, txt): + if txt == '': + self.edit_device.setCurrentIndex(0) + self.current_format = None + self.current_device = None + return + print 'edit_format_changed' + self.clear_fields(new_boxes=True) + txt = unicode(txt) + fpb = self.current_plugboards.get(txt, None) + if fpb is None: + print 'None editable format!' + return + self.current_format = txt + devices = [''] + for d in fpb: + devices.append(d) + self.edit_device.clear() + self.edit_device.addItems(devices) + self.edit_device.setCurrentIndex(0) + + def new_device_changed(self, txt): + if txt == '': + self.current_device = None + return + print 'new_device_changed' + self.clear_fields(edit_boxes=True) + self.current_device = unicode(txt) + error = False + if self.current_format == ' any': + for f in self.current_plugboards: + if self.current_device == ' any' and len(self.current_plugboards[f]): + error = True + break + if self.current_device in self.current_plugboards[f]: + error = True + break + if ' any' in self.current_plugboards[f]: + error = True + break + else: + fpb = self.current_plugboards.get(self.current_format, None) + if fpb is not None: + if ' any' in fpb: + error = True + else: + dpb = fpb.get(self.current_device, None) + if dpb is not None: + error = True + + if error: + error_dialog(self, '', + _('That format and device already has a plugboard'), + show=True) + self.new_device.setCurrentIndex(0) + return + self.set_fields() + + def new_format_changed(self, txt): + if txt == '': + self.current_format = None + self.current_device = None + return + print 'new_format_changed' + self.clear_fields(edit_boxes=True) + self.current_format = unicode(txt) + self.new_device.setCurrentIndex(0) + + def ok_clicked(self): + pb = {} + print self.current_format, self.current_device + for i in range(0, len(self.source_widgets)): + s = self.source_widgets[i].currentIndex() + if s != 0: + d = self.dest_widgets[i].currentIndex() + if d != 0: + pb[self.fields[s]] = self.fields[d] + if len(pb) == 0: + if self.current_format in self.current_plugboards: + fpb = self.current_plugboards[self.current_format] + if self.current_device in fpb: + del fpb[self.current_device] + if len(fpb) == 0: + del self.current_plugboards[self.current_format] + else: + if self.current_format not in self.current_plugboards: + self.current_plugboards[self.current_format] = {} + fpb = self.current_plugboards[self.current_format] + fpb[self.current_device] = pb + self.changed_signal.emit() + self.refill_all_boxes() + + def refill_all_boxes(self): + self.current_device = None + self.current_format = None + self.clear_fields(new_boxes=True) + self.edit_format.clear() + self.edit_format.addItem('') + for format in self.current_plugboards: + self.edit_format.addItem(format) + self.edit_format.setCurrentIndex(0) + self.edit_device.clear() + self.ok_button.setEnabled(False) + + def initialize(self): + def field_cmp(x, y): + if x.startswith('#'): + if y.startswith('#'): + return cmp(x.lower(), y.lower()) + else: + return 1 + elif y.startswith('#'): + return -1 + else: + return cmp(x.lower(), y.lower()) + + ConfigWidgetBase.initialize(self) + + self.devices = ['', ' any', 'save to disk'] + for device in device_plugins(): + self.devices.append(device.name) + self.devices.sort(cmp=lambda x, y: cmp(x.lower(), y.lower())) + self.new_device.addItems(self.devices) + + self.formats = ['', ' any'] + for w in metadata_writers(): + for f in w.file_types: + self.formats.append(f) + self.formats.sort() + self.new_format.addItems(self.formats) + + self.fields = [''] + for f in self.db.all_field_keys(): + if self.db.field_metadata[f].get('rec_index', None) is not None and\ + self.db.field_metadata[f]['datatype'] is not None and \ + self.db.field_metadata[f]['search_terms']: + self.fields.append(f) + self.fields.sort(cmp=field_cmp) + + self.source_widgets = [] + self.dest_widgets = [] + for i in range(0, 10): + w = QtGui.QComboBox(self) + self.source_widgets.append(w) + self.fields_layout.addWidget(w, 5+i, 0, 1, 1) + w = QtGui.QComboBox(self) + self.dest_widgets.append(w) + self.fields_layout.addWidget(w, 5+i, 1, 1, 1) + + self.edit_device.currentIndexChanged[str].connect(self.edit_device_changed) + self.edit_format.currentIndexChanged[str].connect(self.edit_format_changed) + self.new_device.currentIndexChanged[str].connect(self.new_device_changed) + self.new_format.currentIndexChanged[str].connect(self.new_format_changed) + self.ok_button.clicked.connect(self.ok_clicked) + + self.refill_all_boxes() + + def restore_defaults(self): + ConfigWidgetBase.restore_defaults(self) + self.current_plugboards = {} + self.refill_all_boxes() + self.changed_signal.emit() + + def commit(self): + self.db.prefs.set('plugboards', self.current_plugboards) + return ConfigWidgetBase.commit(self) + + def refresh_gui(self, gui): + pass + + +if __name__ == '__main__': + from PyQt4.Qt import QApplication + app = QApplication([]) + test_widget('Import/Export', 'plugboards') + diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui new file mode 100644 index 0000000000..ad72ec359f --- /dev/null +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -0,0 +1,138 @@ + + + Form + + + + 0 + 0 + 707 + 340 + + + + Form + + + + + + Here you can control what metadata calibre uses when saving or sending books: + + + true + + + + + + + + + Add new plugboard + + + + + + + Edit existing plugboard + + + + + + + + + + + + + + + + + + + Format (choose first) + + + Qt::AlignCenter + + + + + + + Device (choose second) + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Source field + + + Qt::AlignCenter + + + + + + + Destination field + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Done + + + + + + + + + + diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index e479d27121..54671da4b4 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -232,6 +232,21 @@ def save_book_to_disk(id, db, root, opts, length): written = False for fmt in formats: + dev_name = 'save to disk' + plugboards = db.prefs.get('plugboards', None) + cpb = None + if fmt in plugboards: + cpb = plugboards[fmt] + elif ' any' in plugboards: + cpb = plugboards[' any'] + if cpb is not None: + if dev_name in cpb: + cpb = cpb[dev_name] + elif ' any' in plugboards[fmt]: + cpb = cpb[' any'] + else: + cpb = None + data = db.format(id, fmt, index_is_id=True) if data is None: continue @@ -242,7 +257,12 @@ def save_book_to_disk(id, db, root, opts, length): stream.write(data) stream.seek(0) try: - set_metadata(stream, mi, fmt) + if cpb: + newmi = mi.deepcopy() + newmi.copy_specific_attributes(mi, cpb) + else: + newmi = mi + set_metadata(stream, newmi, fmt) except: traceback.print_exc() stream.seek(0) From d6fc61d1b706dffe4063aa63f78245ee48401a4a Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 27 Sep 2010 15:14:55 +0100 Subject: [PATCH 163/235] Add the icon --- resources/images/plugboard.png | Bin 0 -> 31806 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/plugboard.png diff --git a/resources/images/plugboard.png b/resources/images/plugboard.png new file mode 100644 index 0000000000000000000000000000000000000000..88f0869b8d9de4552184308b934889c5c83ec85f GIT binary patch literal 31806 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 z

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%0DdusUKrIkg&IKYRAV3uX#C_to6p@@YXYaor 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 rQ#3{?nhp Date: Mon, 27 Sep 2010 15:17:16 +0100 Subject: [PATCH 164/235] Remove print statements --- src/calibre/gui2/preferences/plugboard.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 5691120cef..7fdd093dc1 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -53,7 +53,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): w.addItems(self.fields) def set_field(self, i, src, dst): - print i, src, dst idx = self.fields.index(src) self.source_widgets[i].setCurrentIndex(idx) idx = self.fields.index(dst) @@ -63,16 +62,15 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if txt == '': self.current_device = None return - print 'edit device changed' self.clear_fields(new_boxes=True) self.current_device = unicode(txt) fpb = self.current_plugboards.get(self.current_format, None) if fpb is None: - print 'None format!' + print 'edit_device_changed: none format!' return dpb = fpb.get(self.current_device, None) if dpb is None: - print 'none device!' + print 'edit_device_changed: none device!' return self.set_fields() for i,src in enumerate(dpb): @@ -85,12 +83,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.current_format = None self.current_device = None return - print 'edit_format_changed' self.clear_fields(new_boxes=True) txt = unicode(txt) fpb = self.current_plugboards.get(txt, None) if fpb is None: - print 'None editable format!' + print 'edit_format_changed: none editable format!' return self.current_format = txt devices = [''] @@ -104,7 +101,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if txt == '': self.current_device = None return - print 'new_device_changed' self.clear_fields(edit_boxes=True) self.current_device = unicode(txt) error = False @@ -142,14 +138,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.current_format = None self.current_device = None return - print 'new_format_changed' self.clear_fields(edit_boxes=True) self.current_format = unicode(txt) self.new_device.setCurrentIndex(0) def ok_clicked(self): pb = {} - print self.current_format, self.current_device for i in range(0, len(self.source_widgets)): s = self.source_widgets[i].currentIndex() if s != 0: From c852a659220c4984e3ad42309514ce93f2354599 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Mon, 27 Sep 2010 17:40:27 +0100 Subject: [PATCH 165/235] Fix two null-plugboard problems --- src/calibre/gui2/device.py | 2 +- src/calibre/library/save_to_disk.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index eb1716f782..72ad8b1890 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -1278,7 +1278,7 @@ class DeviceMixin(object): # {{{ :param files: List of either paths to files or file like objects ''' titles = [i.title for i in metadata] - plugboards = self.library_view.model().db.prefs.get('plugboards', None) + plugboards = self.library_view.model().db.prefs.get('plugboards', {}) job = self.device_manager.upload_books( Dispatcher(self.books_uploaded), files, names, on_card=on_card, diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 54671da4b4..2504832df7 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -233,7 +233,7 @@ def save_book_to_disk(id, db, root, opts, length): written = False for fmt in formats: dev_name = 'save to disk' - plugboards = db.prefs.get('plugboards', None) + plugboards = db.prefs.get('plugboards', {}) cpb = None if fmt in plugboards: cpb = plugboards[fmt] From ee8af31f74074bc22f3650051f9f765c4a206fc3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 27 Sep 2010 11:17:27 -0600 Subject: [PATCH 166/235] Add tutorial on using regexps to User Manual --- src/calibre/library/caches.py | 3 +- src/calibre/manual/regexp.rst | 135 +++++++++++++++++++++++++++++++ src/calibre/manual/tutorials.rst | 1 + 3 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 src/calibre/manual/regexp.rst diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 09adc4a9fd..5a30d0f7db 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -6,7 +6,7 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -import re, itertools, time +import re, itertools, time, traceback from itertools import repeat from datetime import timedelta from threading import Thread, RLock @@ -45,7 +45,6 @@ class MetadataBackup(Thread): # {{{ self.keep_running = False def run(self): - import traceback while self.keep_running: try: time.sleep(0.5) # Limit to two per second diff --git a/src/calibre/manual/regexp.rst b/src/calibre/manual/regexp.rst new file mode 100644 index 0000000000..5927cfc1a3 --- /dev/null +++ b/src/calibre/manual/regexp.rst @@ -0,0 +1,135 @@ + +.. include:: global.rst + +.. _regexptutorial: + +All about using regular expressions in |app| +======================================================= + +Regular expressions are features used in many places in |app| to perform sophisticated manipulation of ebook content and metadata. This tutorial is a gentle introduction to getting you started with using regular expressions in |app|. + +.. toctree:: + :maxdepth: 2 + + +First, a word of warning and a word of courage +------------------------------------------------- + +This is, inevitably, going to be somewhat technical- after all, regular expressions are a technical tool for doing technical stuff. I'm going to have to use some jargon and concepts that may seem complicated or convoluted. I'm going to try to explain those concepts as clearly as I can, but really can't do without using them at all. That being said, don't be discouraged by any jargon, as I've tried to explain everything new. And while regular expressions themselves may seem like an arcane, black magic (or, to be more prosaic, a random string of mumbo-jumbo letters and signs), I promise that they are not all that complicated. Even those who understand regular expressions really well have trouble reading the more complex ones, but writing them isn't as difficult- you construct the expression step by step. So, take a step and follow me into the rabbit hole. + +Where in |app| can you use regular expressions? +--------------------------------------------------- + +There are a few places |app| uses regular expressions. There's the header/footer removal in conversion options, metadata detection from filenames in the import settings and, since last version, there's the option to use regular expressions to search and replace in metadata of multiple books. + +What on earth *is* a regular expression? +------------------------------------------------ + +A regular expression is a way to describe sets of strings. A single regular expression cat *match* a number of different strings. This is what makes regular expression so powerful -- they are a concise way of describing a potentially large number of variations. + +.. note:: I'm using string here in the sense it is used in programming languages: a string of one or more characters, characters including actual characters, numbers, punctuation and so-called whitespace (linebreaks, tabulators etc.). Please note that generally, uppercase and lowercase characters are not considered the same, thus "a" being a different character from "A" and so forth. In |app|, regular expressions are case insensitive in the search bar, but not in the conversion options. There's a way to make every regular expression case insensitive, but we'll discuss that later. It gets complicated because regular expressions allow for variations in the strings it matches, so one expression can match multiple strings, which is why people bother using them at all. More on that in a bit. + +Care to explain? +-------------------- + +Well, that's why we're here. First, this is the most important concept in regular expressions: *A string by itself is a regular expression that matches itself*. That is to say, if I wanted to match the string ``"Hello, World!"`` using a regular expression, the regular expression to use would be ``Hello, World!``. And yes, it really is that simple. You'll notice, though, that this *only* matches the exact string ``"Hello, World!"``, not e.g. ``"Hello, wOrld!"`` or ``"hello, world!"`` or any other such variation. + +That doesn't sound too bad. What's next? +------------------------------------------ + +Next is the beginning of the really good stuff. Remember where I said that regular expressions can match multiple strings? This is were it gets a little more complicated. Say, as a somewhat more practical exercise, the ebook you wanted to convert had a nasty footer counting the pages, like "Page 5 of 423". Obviously the page number would rise from 1 to 423, thus you'd have to match 423 different strings, right? Wrong, actually: regular expressions allow you to define sets of characters that are matched: To define a set, you put all the characters you want to be in the set into square brackets. So, for example, the set ``[abc]`` would match either the character "a", "b" or "c". *Sets will always only match one of the characters in the set*. They "understand" character ranges, that is, if you wanted to match all the lower case characters, you'd use the set ``[a-z]`` for lower- and uppercase characters you'd use ``[a-zA-Z]`` and so on. Got the idea? So, obviously, using the expression ``Page [0-9] of 423`` you'd be able to match the first 9 pages, thus reducing the expressions needed to three: The second expression ``Page [0-9][0-9] of 423`` would match all two-digit page numbers, and I'm sure you can guess what the third expression would look like. Yes, go ahead. Write it down. + +Hey, neat! This is starting to make sense! +--------------------------------------------- + +I was hoping you'd say that. But brace yourself, now it gets even better! We just saw that using sets, we could match one of several characters at once. But you can even repeat a character or set, reducing the number of expressions needed to handle the above page number example to one. Yes, ONE! Excited? You should be! It works like this: Some so-called special characters, "+", "?" and "*", *repeat the single element preceding them*. (Element means either a single character, a character set, an escape sequence or a group (we'll learn about those last two later)- in short, any single entity in a regular expression.) These characters are called wildcards or quantifiers. To be more precise, "?" matches *0 or 1* of the preceding element, "*" matches *0 or more* of the preceding element and "+" matches *1 or more* of the preceding element. A few examples: The expression ``a?`` would match either "" (which is the empty string, not strictly useful in this case) or "a", the expression ``a*`` would match "", "a", "aa" or any number of a's in a row, and, finally, the expression ``a+`` would match "a", "aa" or any number of a's in a row (Note: it wouldn't match the empty string!). Same deal for sets: The expression ``[0-9]+`` would match *every integer number there is*! I know what you're thinking, and you're right: If you use that in the above case of matching page numbers, wouldn't that be the single one expression to match all the page numbers? Yes, the expression ``Page [0-9]+ of 423`` would match every page number in that book! + +.. note:: + A note on these quantifiers: They generally try to match as much text as possible, so be careful when using them. This is called "greedy behaviour"- I'm sure you get why. It gets problematic when you, say, try to match a tag. Consider, for example, the string ``"

Title here

"`` and let's say you'd want to match the opening tag (the part between the first pair of angle brackets, a little more on tags later). You'd think that the expression ```` would match that tag, but actually, it matches the whole string! (The character "." is another special character. It matches anything *except* linebreaks, so, basically, the expression ``.*`` would match any single line you can think of.) Instead, try using ```` which makes the quantifier ``"*"`` non-greedy. That expression would only match the first opening tag, as intended. + There's actually another way to accomplish this: The expression ``]*>`` will match that same opening tag- you'll see why after the next section. Just note that there quite frequently is more than one way to write a regular expression. + +Well, these special characters are very neat and all, but what if I wanted to match a dot or a question mark? +----------------------------------------------------------------------------------------------------------------- + +You can of course do that: Just put a backslash in front of any special character and it is interpreted as the literal character, without any special meaning. This pair of a backslash followed by a single character is called an escape sequence, and the act of putting a backslash in front of a special character is called escaping that character. An escape sequence is interpreted as a single element. There are of course escape sequences that do more than just escaping special characters, for example ``"\t"`` means a tabulator. We'll get to some of the escape sequences later. Oh, and by the way, concerning those special characters: Consider any character we discuss in this introduction as having some function to be special and thus needing to be escaped if you want the literal character. + +So, what are the most useful sets? +------------------------------------ + +Knew you'd ask. Some useful sets are ``[0-9]`` matching a single number, ``[a-z]`` matching a single lowercase letter, ``[A-Z]`` matching a single uppercase letter, ``[a-zA-Z]`` matching a single letter and ``[a-zA-Z0-9]`` matching a single letter or number. You can also use an escape sequence as shorthand:: + + \d is equivalent to [0-9] + \w is equivalent to [a-zA-Z0-9_] + \s is equivalent to any whitespace + +.. note:: + "Whitespace" is a term for anything that won't be printed. These characters include space, tabulator, line feed, form feed and carriage return. + +As a last note on sets, you can also define a set as any character *but* those in the set. You do that by including the character ``"^"`` as the *very first character in the set*. Thus, ``[^a]`` would match any character excluding "a". That's called complementing the set. Those escape sequence shorthands we saw earlier can also be complemented: ``"\D"`` means any non-number character, thus being equivalent to ``[^0-9]``. The other shorthands can be complemented by, you guessed it, using the respective uppercase letter instead of the lowercase one. So, going back to the example ``]*>`` from the previous section, now you can see that the character set it's using tries to match any character except for a closing angle bracket. + +But if I had a few varying strings I wanted to match, things get complicated? +------------------------------------------------------------------------------- + +Fear not, life still is good and easy. Consider this example: The book you're converting has "Title" written on every odd page and "Author" written on every even page. Looks great in print, right? But in ebooks, it's annoying. You can group whole expressions in normal parentheses, and the character ``"|"`` will let you match *either* the expression to its right *or* the one to its left. Combine those and you're done. Too fast for you? Okay, first off, we group the expressions for odd and even pages, thus getting ``(Title)(Author)`` as our two needed expressions. Now we make things simpler by using the vertical bar (``"|"`` is called the vertical bar character): If you use the expression ``(Title|Author)`` you'll either get a match for "Title" (on the odd pages) or you'd match "Author" (on the even pages). Well, wasn't that easy? + +You can, of course, use the vertical bar without using grouping parentheses, as well. Remember when I said that quantifiers repeat the element preceding them? Well, the vertical bar works a little differently: The expression "Title|Author" will also match either the string "Title" or the string "Author", just as the above example using grouping. *The vertical bar selects between the entire expression preceding and following it*. So, if you wanted to match the strings "Calibre" and "calibre" and wanted to select only between the upper- and lowercase "c", you'd have to use the expression ``(c|C)alibre``, where the grouping ensures that only the "c" will be selected. If you were to use ``c|Calibre``, you'd get a match on the string "c" or on the string "Calibre", which isn't what we wanted. In short: If in doubt, use grouping together with the vertical bar. + +You missed... +------------------- + +... wait just a minute, there's one last, really neat thing you can do with groups. If you have a group that you previously matched, you can use references to that group later in the expression: Groups are numbered starting with 1, and you reference them by escaping the number of the group you want to reference, thus, the fifth group would be referenced as ``\5``. So, if you searched for ``([^ ]+) \1`` in the string "Test Test", you'd match the whole string! + + +You missed something. In the beginning, you said there was a way to make a regular expression case insensitive? +------------------------------------------------------------------------------------------------------------------ + +Yes, I did, thanks for paying attention and reminding me. You can tell |app| how you want certain things handled by using something called flags. You include flags in your expression by using the special construct ``(?flags go here)`` where, obviously, you'd replace "flags go here" with the specific flags you want. For ignoring case, the flag is ``i``, thus you include ``(?i)`` in your expression. Thus, ``test(?i)`` would match "Test", "tEst", "TEst" and any case variation you could think of. + +Another useful flag lets the dot match any character at all, *including* the newline, the flag ``s``. If you want to use multiple flags in an expression, just put them in the same statement: ``(?is)`` would ignore case and make the dot match all. It doesn't matter which flag you state first, ``(?si)`` would be equivalent to the above. By the way, good places for putting flags in your expression would be either the very beginning or the very end. That way, they don't get mixed up with anything else. + +I think I'm beginning to understand these regular expressions now... how do I use them in |app|? +----------------------------------------------------------------------------------------------------- + +Conversions +^^^^^^^^^^^^^^ + +Let's begin with the conversion settings, which is really neat. In the structure detection part, you can input a regexp (short for regular expression) that describes the header or footer string that will be removed during the conversion. The neat part is the wizard. Click on the wizard staff and you get a preview of what |app| "sees" during the conversion process. Scroll down to the header or footer you want to remove, select and copy it, paste it into the regexp field on top of the window. If there are variable parts, like page numbers or so, use sets and quantifiers to cover those, and while you're at it, remember to escape special characters, if there are some. Hit the button labeled :guilabel:`Test` and |app| highlights the parts it would remove were you to use the regexp. Once you're satisfied, hit OK and convert. Be careful if your conversion source has tags like this example:: + + Maybe, but the cops feel like you do, Anita. What's one more dead vampire? + New laws don't change that.

+

Generated by ABC Amber LIT Conv + erter, + http://www.processtext.com/abclit.html

+

It had only been two years since Addison v. Clark. + The court case gave us a revised version of what life was + +(shamelessly ripped out of `this thread `_). You'd have to remove some of the tags as well. In this example, I'd recommend beginning with the tag ````, now you have to end with the corresponding closing tag (opening tags are ````, closing tags are ````), which is simply the next ```` in this case. (Refer to a good HTML manual or ask in the forum if you are unclear on this point.) The opening tag can be described using ````, the closing tag using ````, thus we could remove everything between those tags using ``.*?``. But using this expression would be a bad idea, because it removes everything enclosed by - tags (which, by the way, render the enclosed text in bold print), and it's a fair bet that we'll remove portions of the book in this way. Instead, include the beginning of the enclosed string as well, making the regular expression ``\s*Generated\s+by\s+ABC\s+Amber\s+LIT.*?`` The ``\s`` with quantifiers are included here instead of explicitly using the spaces as seen in the string to catch any variations of the string that might occur. Remember to check what |app| will remove to make sure you don't remove any portions you want to keep if you test a new expression. If you only check one occurrence, you might miss a mismatch somewhere else in the text. Also note that should you accidentally remove more or fewer tags than you actually wanted to, |app| tries to repair the damaged code after doing the header/footer removal. + +Adding books +^^^^^^^^^^^^^^^^ + +Another thing you can use regular expressions for is to extract metadata from filenames. You can find this feature in the "Adding books" part of the settings. There's a special feature here: You can use field names for metadata fields, for example ``(?P)`` would indicate that calibre uses this part of the string as book title. The allowed field names are listed in the windows, together with another nice test field. An example: Say you want to import a whole bunch of files named like ``Classical Texts: The Divine Comedy by Dante Alighieri.mobi``. +(Obviously, this is already in your library, since we all love classical italian poetry) or ``Science Fiction epics: The Foundation Trilogy by Isaac Asimov.epub``. This is obviously a naming scheme that |app| won't extract any meaningful data out of - its standard expression for extracting metadata is ``(?P<title>.+) - (?P<author>[^_]+)``. A regular expression that works here would be ``[a-zA-Z]+: (?P<title>.+) by (?P<author>.+)``. Please note that, inside the group for the metadata field, you need to use expressions to describe what the field actually matches. And also note that, when using the test field |app| provides, you need to add the file extension to your testing filename, otherwise you won't get any matches at all, despite using a working expression. + +Bulk editing metadata +^^^^^^^^^^^^^^^^^^^^^^^ + +The last part is regular expression search and replace in metadata fields. You can access this by selecting multiple books in the library and using bulk metadata edit. Be very careful when using this last feature, as it can do **Very Bad Things** to your library! Doublecheck that your expressions do what you want them to using the test fields, and only mark the books you really want to change! In the regular expression search mode, you can search in one field, replace the text with something and even write the result into another field. A practical example: Say your library contained the books of Frank Herbert's Dune series, named after the fashion ``Dune 1 - Dune``, ``Dune 2 - Dune Messiah`` and so on. Now you want to get ``Dune`` into the series field. You can do that by searching for ``(.*?) \d+ - .*`` in the title field and replacing it with ``\1`` in the series field. See what I did there? That's a reference to the first group you're replacing the series field with. Now that you have the series all set, you only need to do another search for ``.*? -`` in the title field and replace it with ``""`` (an empty string), again in the title field, and your metadata is all neat and tidy. Isn't that great? By the way, instead of replacing the entire field, you can also append or prepend to the field, so, if you *wanted* the book title to be prepended with series info, you could do that as well. As you by now have undoubtedly noticed, there's a checkbox labeled :guilabel:`Case sensitive`, so you won't have to use flags to select behaviour here. + +Well, that just about concludes the very short introduction to regular expressions. Hopefully I'll have shown you enough to at least get you started and to enable you to continue learning by yourself- a good starting point would be the `Python documentation for regexps <http://docs.python.org/library/re.html>`_. + +One last word of warning, though: Regexps are powerful, but also really easy to get wrong. |app| provides really great testing possibilities to see if your expressions behave as you expect them to. Use them. Try not to shoot yourself in the foot. (God, I love that expression...) But should you, despite the warning, injure your foot (or any other body parts), try to learn from it. + +Credits +------------- + +Thanks for helping with tips, corrections and such: + + * ldolse + * kovidgoyal + * chaley + * dwanthny + * kacir + * Starson17 + + diff --git a/src/calibre/manual/tutorials.rst b/src/calibre/manual/tutorials.rst index 1e4cab8493..084c44ff64 100644 --- a/src/calibre/manual/tutorials.rst +++ b/src/calibre/manual/tutorials.rst @@ -14,5 +14,6 @@ Here you will find tutorials to get you started using |app|'s more advanced feat news xpath template_lang + regexp portable From c3dadbf3041d5eb828fb3b3a7bd91b5f3c69a6e2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Mon, 27 Sep 2010 11:43:06 -0600 Subject: [PATCH 167/235] ... --- src/calibre/manual/regexp.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/manual/regexp.rst b/src/calibre/manual/regexp.rst index 5927cfc1a3..5cd9a8b097 100644 --- a/src/calibre/manual/regexp.rst +++ b/src/calibre/manual/regexp.rst @@ -8,8 +8,9 @@ All about using regular expressions in |app| Regular expressions are features used in many places in |app| to perform sophisticated manipulation of ebook content and metadata. This tutorial is a gentle introduction to getting you started with using regular expressions in |app|. -.. toctree:: - :maxdepth: 2 +.. contents:: Contents + :depth: 2 + :local: First, a word of warning and a word of courage @@ -80,7 +81,7 @@ You missed... ... wait just a minute, there's one last, really neat thing you can do with groups. If you have a group that you previously matched, you can use references to that group later in the expression: Groups are numbered starting with 1, and you reference them by escaping the number of the group you want to reference, thus, the fifth group would be referenced as ``\5``. So, if you searched for ``([^ ]+) \1`` in the string "Test Test", you'd match the whole string! -You missed something. In the beginning, you said there was a way to make a regular expression case insensitive? +In the beginning, you said there was a way to make a regular expression case insensitive? ------------------------------------------------------------------------------------------------------------------ Yes, I did, thanks for paying attention and reminding me. You can tell |app| how you want certain things handled by using something called flags. You include flags in your expression by using the special construct ``(?flags go here)`` where, obviously, you'd replace "flags go here" with the specific flags you want. For ignoring case, the flag is ``i``, thus you include ``(?i)`` in your expression. Thus, ``test(?i)`` would match "Test", "tEst", "TEst" and any case variation you could think of. From 62f1edd84879022bcd89d75fcc70bdfb0d33fed1 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 28 Sep 2010 11:41:35 +0100 Subject: [PATCH 168/235] Cleanups of plugboard code. Improvements to the gui. --- src/calibre/ebooks/metadata/book/base.py | 1 - src/calibre/gui2/device.py | 14 +- src/calibre/gui2/preferences/plugboard.py | 196 +++++++++++++--------- src/calibre/gui2/preferences/plugboard.ui | 80 +++++---- src/calibre/library/save_to_disk.py | 19 ++- 5 files changed, 191 insertions(+), 119 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index aaa7c78e9a..951a55da10 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -303,7 +303,6 @@ class Metadata(object): return for src in attrs: try: - print src sfm = other.metadata_for_field(src) dfm = self.metadata_for_field(attrs[src]) if dfm['is_multiple']: diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 72ad8b1890..4c866b1855 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -34,6 +34,8 @@ from calibre.ebooks.metadata.meta import set_metadata from calibre.constants import DEBUG from calibre.utils.config import prefs, tweaks from calibre.utils.magick.draw import thumbnail +from calibre.library.save_to_disk import plugboard_any_device_value, \ + plugboard_any_format_value # }}} class DeviceJob(BaseJob): # {{{ @@ -323,22 +325,22 @@ class DeviceManager(Thread): # {{{ for f, mi in zip(files, metadata): if isinstance(f, unicode): ext = f.rpartition('.')[-1].lower() - dev_name = self.connected_device.name + dev_name = self.connected_device.__class__.__name__ cpb = None if ext in plugboards: cpb = plugboards[ext] - elif ' any' in plugboards: - cpb = plugboards[' any'] + elif plugboard_any_format_value in plugboards: + cpb = plugboards[plugboard_any_format_value] if cpb is not None: if dev_name in cpb: cpb = cpb[dev_name] - elif ' any' in plugboards[ext]: - cpb = cpb[' any'] + elif plugboard_any_device_value in plugboards[ext]: + cpb = cpb[plugboard_any_device_value] else: cpb = None if DEBUG: - prints('Using plugboard', cpb) + prints('Using plugboard', ext, dev_name, cpb) if ext: try: if DEBUG: diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 7fdd093dc1..b723fb938c 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -8,32 +8,84 @@ __docformat__ = 'restructuredtext en' from PyQt4 import QtGui from calibre.gui2 import error_dialog -from calibre.gui2.preferences import ConfigWidgetBase, test_widget, \ - AbortCommit +from calibre.gui2.preferences import ConfigWidgetBase, test_widget from calibre.gui2.preferences.plugboard_ui import Ui_Form from calibre.customize.ui import metadata_writers, device_plugins - +from calibre.library.save_to_disk import plugboard_any_format_value, \ + plugboard_any_device_value, plugboard_save_to_disk_value class ConfigWidget(ConfigWidgetBase, Ui_Form): def genesis(self, gui): self.gui = gui self.db = gui.library_view.model().db - self.current_plugboards = self.db.prefs.get('plugboards', {'epub': {' any': {'title':'authors', 'authors':'tags'}}}) + self.current_plugboards = self.db.prefs.get('plugboards',{}) self.current_device = None self.current_format = None -# self.proxy = ConfigProxy(config()) -# -# r = self.register -# -# for x in ('asciiize', 'update_metadata', 'save_cover', 'write_opf', -# 'replace_whitespace', 'to_lowercase', 'formats', 'timefmt'): -# r(x, self.proxy) -# -# self.save_template.changed_signal.connect(self.changed_signal.emit) + + def initialize(self): + def field_cmp(x, y): + if x.startswith('#'): + if y.startswith('#'): + return cmp(x.lower(), y.lower()) + else: + return 1 + elif y.startswith('#'): + return -1 + else: + return cmp(x.lower(), y.lower()) + + ConfigWidgetBase.initialize(self) + + self.devices = [''] + for device in device_plugins(): + n = device.__class__.__name__ + if n.startswith('FOLDER_DEVICE'): + n = 'FOLDER_DEVICE' + self.devices.append(n) + self.devices.sort(cmp=lambda x, y: cmp(x.lower(), y.lower())) + self.devices.insert(1, plugboard_save_to_disk_value) + self.devices.insert(2, plugboard_any_device_value) + self.new_device.addItems(self.devices) + + self.formats = [''] + for w in metadata_writers(): + for f in w.file_types: + self.formats.append(f) + self.formats.sort() + self.formats.insert(1, plugboard_any_format_value) + self.new_format.addItems(self.formats) + + self.fields = [''] + for f in self.db.all_field_keys(): + if self.db.field_metadata[f].get('rec_index', None) is not None and\ + self.db.field_metadata[f]['datatype'] is not None and \ + self.db.field_metadata[f]['search_terms']: + self.fields.append(f) + self.fields.sort(cmp=field_cmp) + + self.source_widgets = [] + self.dest_widgets = [] + for i in range(0, 10): + w = QtGui.QComboBox(self) + self.source_widgets.append(w) + self.fields_layout.addWidget(w, 5+i, 0, 1, 1) + w = QtGui.QComboBox(self) + self.dest_widgets.append(w) + self.fields_layout.addWidget(w, 5+i, 1, 1, 1) + + self.edit_device.currentIndexChanged[str].connect(self.edit_device_changed) + self.edit_format.currentIndexChanged[str].connect(self.edit_format_changed) + self.new_device.currentIndexChanged[str].connect(self.new_device_changed) + self.new_format.currentIndexChanged[str].connect(self.new_format_changed) + self.ok_button.clicked.connect(self.ok_clicked) + self.del_button.clicked.connect(self.del_clicked) + + self.refill_all_boxes() def clear_fields(self, edit_boxes=False, new_boxes=False): self.ok_button.setEnabled(False) + self.del_button.setEnabled(False) for w in self.source_widgets: w.clear() for w in self.dest_widgets: @@ -47,6 +99,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): def set_fields(self): self.ok_button.setEnabled(True) + self.del_button.setEnabled(True) for w in self.source_widgets: w.addItems(self.fields) for w in self.dest_widgets: @@ -76,6 +129,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): for i,src in enumerate(dpb): self.set_field(i, src, dpb[src]) self.ok_button.setEnabled(True) + self.del_button.setEnabled(True) def edit_format_changed(self, txt): if txt == '': @@ -104,26 +158,42 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.clear_fields(edit_boxes=True) self.current_device = unicode(txt) error = False - if self.current_format == ' any': + if self.current_format == plugboard_any_format_value: + # user specified any format. for f in self.current_plugboards: - if self.current_device == ' any' and len(self.current_plugboards[f]): + devs = set(self.current_plugboards[f]) + print 'check', self.current_format, devs + if self.current_device != plugboard_save_to_disk_value and \ + plugboard_any_device_value in devs: + # specific format/any device in list. conflict. + # note: any device does not match save_to_disk error = True break - if self.current_device in self.current_plugboards[f]: + if self.current_device in devs: + # specific format/current device in list. conflict error = True break - if ' any' in self.current_plugboards[f]: + if self.current_device == plugboard_any_device_value: + # any device and a specific device already there. conflict error = True break else: - fpb = self.current_plugboards.get(self.current_format, None) - if fpb is not None: - if ' any' in fpb: + # user specified specific format. + for f in self.current_plugboards: + devs = set(self.current_plugboards[f]) + if f == plugboard_any_format_value and \ + self.current_device in devs: + # any format/same device in list. conflict. error = True - else: - dpb = fpb.get(self.current_device, None) - if dpb is not None: - error = True + break + if f == self.current_format and self.current_device in devs: + # current format/current device in list. conflict + error = True + break + if f == self.current_format and plugboard_any_device_value in devs: + # current format/any device in list. conflict + error = True + break if error: error_dialog(self, '', @@ -165,6 +235,16 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.changed_signal.emit() self.refill_all_boxes() + def del_clicked(self): + if self.current_format in self.current_plugboards: + fpb = self.current_plugboards[self.current_format] + if self.current_device in fpb: + del fpb[self.current_device] + if len(fpb) == 0: + del self.current_plugboards[self.current_format] + self.changed_signal.emit() + self.refill_all_boxes() + def refill_all_boxes(self): self.current_device = None self.current_format = None @@ -176,59 +256,21 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.edit_format.setCurrentIndex(0) self.edit_device.clear() self.ok_button.setEnabled(False) - - def initialize(self): - def field_cmp(x, y): - if x.startswith('#'): - if y.startswith('#'): - return cmp(x.lower(), y.lower()) - else: - return 1 - elif y.startswith('#'): - return -1 - else: - return cmp(x.lower(), y.lower()) - - ConfigWidgetBase.initialize(self) - - self.devices = ['', ' any', 'save to disk'] - for device in device_plugins(): - self.devices.append(device.name) - self.devices.sort(cmp=lambda x, y: cmp(x.lower(), y.lower())) - self.new_device.addItems(self.devices) - - self.formats = ['', ' any'] - for w in metadata_writers(): - for f in w.file_types: - self.formats.append(f) - self.formats.sort() - self.new_format.addItems(self.formats) - - self.fields = [''] - for f in self.db.all_field_keys(): - if self.db.field_metadata[f].get('rec_index', None) is not None and\ - self.db.field_metadata[f]['datatype'] is not None and \ - self.db.field_metadata[f]['search_terms']: - self.fields.append(f) - self.fields.sort(cmp=field_cmp) - - self.source_widgets = [] - self.dest_widgets = [] - for i in range(0, 10): - w = QtGui.QComboBox(self) - self.source_widgets.append(w) - self.fields_layout.addWidget(w, 5+i, 0, 1, 1) - w = QtGui.QComboBox(self) - self.dest_widgets.append(w) - self.fields_layout.addWidget(w, 5+i, 1, 1, 1) - - self.edit_device.currentIndexChanged[str].connect(self.edit_device_changed) - self.edit_format.currentIndexChanged[str].connect(self.edit_format_changed) - self.new_device.currentIndexChanged[str].connect(self.new_device_changed) - self.new_format.currentIndexChanged[str].connect(self.new_format_changed) - self.ok_button.clicked.connect(self.ok_clicked) - - self.refill_all_boxes() + self.del_button.setEnabled(False) + txt = '' + for f in self.formats: + if f not in self.current_plugboards: + continue + for d in self.devices: + if d not in self.current_plugboards[f]: + continue + ops = [] + for op in self.fields: + if op not in self.current_plugboards[f][d]: + continue + ops.append(op + '->' + self.current_plugboards[f][d][op]) + txt += '%s:%s [%s]\n'%(f, d, ', '.join(ops)) + self.existing_plugboards.setPlainText(txt) def restore_defaults(self): ConfigWidgetBase.restore_defaults(self) diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index ad72ec359f..f88af8ff50 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -26,32 +26,6 @@ </item> <item row="1" column="0"> <layout class="QGridLayout" name="gridLayout_2"> - <item row="1" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Add new plugboard</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Edit existing plugboard</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="new_format"/> - </item> - <item row="1" column="2"> - <widget class="QComboBox" name="new_device"/> - </item> - <item row="2" column="1"> - <widget class="QComboBox" name="edit_format"/> - </item> - <item row="2" column="2"> - <widget class="QComboBox" name="edit_device"/> - </item> <item row="0" column="1"> <widget class="QLabel" name="label_6"> <property name="text"> @@ -72,7 +46,50 @@ </property> </widget> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Add new plugboard</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="new_format"/> + </item> + <item row="1" column="2"> + <widget class="QComboBox" name="new_device"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Edit existing plugboard</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="edit_format"/> + </item> + <item row="2" column="2"> + <widget class="QComboBox" name="edit_device"/> + </item> <item row="3" column="0"> + <widget class="QLabel" name="label_41"> + <property name="text"> + <string>Existing plugboards</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2"> + <widget class="QPlainTextEdit" name="existing_plugboards"> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + </widget> + </item> + <item row="4" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -122,10 +139,17 @@ </property> </spacer> </item> - <item row="19" column="0" colspan="2"> + <item row="19" column="0"> <widget class="QPushButton" name="ok_button"> <property name="text"> - <string>Done</string> + <string>Save</string> + </property> + </widget> + </item> + <item row="19" column="1"> + <widget class="QPushButton" name="del_button"> + <property name="text"> + <string>Delete</string> </property> </widget> </item> diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 2504832df7..5465150797 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -17,7 +17,12 @@ from calibre.ebooks.metadata.meta import set_metadata from calibre.constants import preferred_encoding, filesystem_encoding from calibre.ebooks.metadata import fmt_sidx from calibre.ebooks.metadata import title_sort -from calibre import strftime +from calibre import strftime, prints + +plugboard_any_device_value = 'any device' +plugboard_any_format_value = 'any format' +plugboard_save_to_disk_value = 'save_to_disk' + DEFAULT_TEMPLATE = '{author_sort}/{title}/{title} - {authors}' DEFAULT_SEND_TEMPLATE = '{author_sort}/{title} - {authors}' @@ -232,21 +237,21 @@ def save_book_to_disk(id, db, root, opts, length): written = False for fmt in formats: - dev_name = 'save to disk' + global plugboard_save_to_disk_value, plugboard_any_format_value + dev_name = plugboard_save_to_disk_value plugboards = db.prefs.get('plugboards', {}) cpb = None if fmt in plugboards: cpb = plugboards[fmt] - elif ' any' in plugboards: - cpb = plugboards[' any'] + elif plugboard_any_format_value in plugboards: + cpb = plugboards[plugboard_any_format_value] + # must find a save_to_disk entry for this format if cpb is not None: if dev_name in cpb: cpb = cpb[dev_name] - elif ' any' in plugboards[fmt]: - cpb = cpb[' any'] else: cpb = None - + prints('Using plugboard:', fmt, cpb) data = db.format(id, fmt, index_is_id=True) if data is None: continue From e08da942ec7a1c12db488c0e49bd6cb0c61aef6b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 28 Sep 2010 11:46:53 +0100 Subject: [PATCH 169/235] Fix typo in faq.rst (too -> to) --- src/calibre/manual/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst index c9f6abe2c0..3cf171bc1b 100644 --- a/src/calibre/manual/faq.rst +++ b/src/calibre/manual/faq.rst @@ -289,7 +289,7 @@ Yes, you can. Follow the instructions in the answer above for adding custom colu How do I move my |app| library from one computer to another? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring too already has a calibre installation, then the Welcome wizard wont run. In that case, click the calibre icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on the toolbar. +Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring to already has a calibre installation, then the Welcome wizard wont run. In that case, click the calibre icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on the toolbar. Note that if you are transferring between different types of computers (for example Windows to OS X) then after doing the above you should also go to :guilabel:`Preferences->Advanced->Miscellaneous` and click the "Check database integrity button". It will warn you about missing files, if any, which you should then transfer by hand. From cca39d2e730a2877a753747ba2b4fd93a9b6384f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 28 Sep 2010 13:11:55 +0100 Subject: [PATCH 170/235] Small cleanups for messages and name --- src/calibre/customize/builtins.py | 2 +- src/calibre/gui2/preferences/plugboard.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 89c800afb2..cf6995d3bb 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -799,7 +799,7 @@ class Sending(PreferencesPlugin): class Plugboard(PreferencesPlugin): name = 'Plugboard' icon = I('plugboard.png') - gui_name = _('Metadata plugboard') + gui_name = _('Metadata plugboards') category = 'Import/Export' gui_category = _('Import/Export') category_order = 3 diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index b723fb938c..124654b643 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -197,7 +197,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if error: error_dialog(self, '', - _('That format and device already has a plugboard'), + _('That format and device already has a plugboard or ' + 'conflicts with another plugboard.'), show=True) self.new_device.setCurrentIndex(0) return From 8a94c2194eada809060d3918d501f7029c0947ff Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 28 Sep 2010 15:13:30 +0100 Subject: [PATCH 171/235] Fix mutually recursive fields in save_to_disk. Fix mistake in any_format template handling in save_to_disk --- src/calibre/library/save_to_disk.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index 5465150797..a2c8a62694 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -111,18 +111,31 @@ class SafeFormat(TemplateFormatter): ''' Provides a format function that substitutes '' for any missing value ''' + + composite_values = {} + def get_value(self, key, args, kwargs): try: b = self.book.get_user_metadata(key, False) key = key.lower() if b is not None and b['datatype'] == 'composite': - return self.vformat(b['display']['composite_template'], [], kwargs) + if key in self.composite_values: + return self.composite_values[key] + self.composite_values[key] = 'RECURSIVE_COMPOSITE FIELD (S2D) ' + key + self.composite_values[key] = \ + self.vformat(b['display']['composite_template'], [], kwargs) + return self.composite_values[key] if kwargs[key]: return self.sanitize(kwargs[key.lower()]) return '' except: return '' + def safe_format(self, fmt, kwargs, error_value, book, sanitize=None): + self.composite_values = {} + return TemplateFormatter.safe_format(self, fmt, kwargs, error_value, + book, sanitize) + safe_formatter = SafeFormat() def get_components(template, mi, id, timefmt='%b %Y', length=250, @@ -243,10 +256,12 @@ def save_book_to_disk(id, db, root, opts, length): cpb = None if fmt in plugboards: cpb = plugboards[fmt] - elif plugboard_any_format_value in plugboards: + if dev_name in cpb: + cpb = cpb[dev_name] + else: + cpb = None + if cpb is None and plugboard_any_format_value in plugboards: cpb = plugboards[plugboard_any_format_value] - # must find a save_to_disk entry for this format - if cpb is not None: if dev_name in cpb: cpb = cpb[dev_name] else: From 96bc9f6bec337c2d551a0171f42ca9759d715326 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 16:55:22 -0600 Subject: [PATCH 172/235] Stop metadata backup thread before bulk metadata edits to improve performance --- src/calibre/gui2/actions/edit_metadata.py | 2 +- src/calibre/gui2/dialogs/metadata_bulk.py | 20 ++++++++++++++------ src/calibre/gui2/library/models.py | 19 +++++++++++++------ src/calibre/gui2/preferences/misc.py | 13 ++++++------- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index bd9728989b..cc74b3c515 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -184,7 +184,7 @@ class EditMetadataAction(InterfaceAction): self.gui.tags_view.blockSignals(True) try: changed = MetadataBulkDialog(self.gui, rows, - self.gui.library_view.model().db).changed + self.gui.library_view.model()).changed finally: self.gui.tags_view.blockSignals(False) if changed: diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 9c83b3aee5..b0ce0a1e6d 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -142,12 +142,13 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): _('Append to field'), ] - def __init__(self, window, rows, db): + def __init__(self, window, rows, model): QDialog.__init__(self, window) Ui_MetadataBulkDialog.__init__(self) self.setupUi(self) - self.db = db - self.ids = [db.id(r) for r in rows] + self.model = model + self.db = model.db + self.ids = [self.db.id(r) for r in rows] self.box_title.setText('<p>' + _('Editing meta information for <b>%d books</b>') % len(rows)) @@ -170,7 +171,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.tag_editor_button.clicked.connect(self.tag_editor) self.autonumber_series.stateChanged[int].connect(self.auto_number_changed) - if len(db.custom_field_keys(include_composites=False)) == 0: + if len(self.db.custom_field_keys(include_composites=False)) == 0: self.central_widget.removeTab(1) else: self.create_custom_column_editors() @@ -617,8 +618,15 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.worker = Worker(args, self.db, self.ids, getattr(self, 'custom_column_widgets', []), Dispatcher(bb.accept, parent=bb)) - self.worker.start() - bb.exec_() + + # The metadata backup thread causes database commits + # which can slow down bulk editing of large numbers of books + self.model.stop_metadata_backup() + try: + self.worker.start() + bb.exec_() + finally: + self.model.start_metadata_backup() if self.worker.error is not None: return error_dialog(self, _('Failed'), diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index b2a7f08055..9da5420681 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -159,17 +159,24 @@ class BooksModel(QAbstractTableModel): # {{{ # do something on the GUI thread. Deadlock. self.cover_cache = CoverCache(db, FunctionDispatcher(self.db.cover)) self.cover_cache.start() - if self.metadata_backup is not None: - self.metadata_backup.stop() - # Would like to to a join here, but the thread might be waiting to - # do something on the GUI thread. Deadlock. - self.metadata_backup = MetadataBackup(db) - self.metadata_backup.start() + self.stop_metadata_backup() + self.start_metadata_backup() def refresh_cover(event, ids): if event == 'cover' and self.cover_cache is not None: self.cover_cache.refresh(ids) db.add_listener(refresh_cover) + def start_metadata_backup(self): + self.metadata_backup = MetadataBackup(self.db) + self.metadata_backup.start() + + def stop_metadata_backup(self): + if getattr(self, 'metadata_backup', None) is not None: + self.metadata_backup.stop() + # Would like to to a join here, but the thread might be waiting to + # do something on the GUI thread. Deadlock. + + def refresh_ids(self, ids, current_row=-1): rows = self.db.refresh_ids(ids) if rows: diff --git a/src/calibre/gui2/preferences/misc.py b/src/calibre/gui2/preferences/misc.py index 865115c2ed..582d110c6c 100644 --- a/src/calibre/gui2/preferences/misc.py +++ b/src/calibre/gui2/preferences/misc.py @@ -106,14 +106,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): d.exec_() def compact(self, *args): - from calibre.library.caches import MetadataBackup m = self.gui.library_view.model() - if m.metadata_backup is not None: - m.metadata_backup.stop() - d = CheckIntegrity(m.db, self) - d.exec_() - m.metadata_backup = MetadataBackup(m.db) - m.metadata_backup.start() + m.stop_metadata_backup() + try: + d = CheckIntegrity(m.db, self) + d.exec_() + finally: + m.start_metadata_backup() def open_config_dir(self, *args): from calibre.utils.config import config_dir From fef738c53b8d5a980423d1930e6a94d4ffc8a6a8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 18:08:54 -0600 Subject: [PATCH 173/235] ... --- src/calibre/manual/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst index c9f6abe2c0..3cf171bc1b 100644 --- a/src/calibre/manual/faq.rst +++ b/src/calibre/manual/faq.rst @@ -289,7 +289,7 @@ Yes, you can. Follow the instructions in the answer above for adding custom colu How do I move my |app| library from one computer to another? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring too already has a calibre installation, then the Welcome wizard wont run. In that case, click the calibre icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on the toolbar. +Simply copy the |app| library folder from the old to the new computer. You can find out what the library folder is by clicking the calibre icon in the toolbar. The very first item is the path to the library folder. Now on the new computer, start |app| for the first time. It will run the Welcome Wizard asking you for the location of the |app| library. Point it to the previously copied folder. If the computer you are transferring to already has a calibre installation, then the Welcome wizard wont run. In that case, click the calibre icon in the tooolbar and point it to the newly copied directory. You will now have two calibre libraries on your computer and you can switch between them by clicking the calibre icon on the toolbar. Note that if you are transferring between different types of computers (for example Windows to OS X) then after doing the above you should also go to :guilabel:`Preferences->Advanced->Miscellaneous` and click the "Check database integrity button". It will warn you about missing files, if any, which you should then transfer by hand. From ca0e8729d20c1c857254186b9f658edfdbaf0c5e Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 18:15:31 -0600 Subject: [PATCH 174/235] Handle formatting of recursive compisite templates --- src/calibre/library/save_to_disk.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index e479d27121..088b6352af 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -106,18 +106,31 @@ class SafeFormat(TemplateFormatter): ''' Provides a format function that substitutes '' for any missing value ''' + + composite_values = {} + def get_value(self, key, args, kwargs): try: b = self.book.get_user_metadata(key, False) key = key.lower() if b is not None and b['datatype'] == 'composite': - return self.vformat(b['display']['composite_template'], [], kwargs) + if key in self.composite_values: + return self.composite_values[key] + self.composite_values[key] = 'RECURSIVE_COMPOSITE FIELD (S2D) ' + key + self.composite_values[key] = \ + self.vformat(b['display']['composite_template'], [], kwargs) + return self.composite_values[key] if kwargs[key]: return self.sanitize(kwargs[key.lower()]) return '' except: return '' + def safe_format(self, fmt, kwargs, error_value, book, sanitize=None): + self.composite_values = {} + return TemplateFormatter.safe_format(self, fmt, kwargs, error_value, + book, sanitize) + safe_formatter = SafeFormat() def get_components(template, mi, id, timefmt='%b %Y', length=250, From c8477338a68b55a5fb92af145a516785a96ab273 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 18:21:52 -0600 Subject: [PATCH 175/235] Do not have the fetch news dialog close when the user presses Enter --- src/calibre/gui2/dialogs/scheduler.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py index fd8184933f..30f4a2d8a2 100644 --- a/src/calibre/gui2/dialogs/scheduler.py +++ b/src/calibre/gui2/dialogs/scheduler.py @@ -57,6 +57,10 @@ class SchedulerDialog(QDialog, Ui_Dialog): self.old_news.setValue(gconf['oldest_news']) + def keyPressEvent(self, ev): + if ev.key() not in (Qt.Key_Enter, Qt.Key_Return): + return QDialog.keyPressEvent(self, ev) + def break_cycles(self): self.disconnect(self.recipe_model, SIGNAL('searched(PyQt_PyObject)'), self.search_done) From d3053b8a8612d24aec9c81dafd5567defdb37a50 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 18:45:41 -0600 Subject: [PATCH 176/235] Support for the JetBook Mini --- src/calibre/customize/builtins.py | 3 ++- src/calibre/devices/__init__.py | 12 +++++++++--- src/calibre/devices/jetbook/driver.py | 23 +++++++++++++++++++++++ src/calibre/gui2/wizard/__init__.py | 8 ++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index ef3da9ce20..50d8e29373 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -446,7 +446,7 @@ from calibre.devices.eb600.driver import EB600, COOL_ER, SHINEBOOK, \ BOOQ, ELONEX, POCKETBOOK301, MENTOR from calibre.devices.iliad.driver import ILIAD from calibre.devices.irexdr.driver import IREXDR1000, IREXDR800 -from calibre.devices.jetbook.driver import JETBOOK, MIBUK +from calibre.devices.jetbook.driver import JETBOOK, MIBUK, JETBOOK_MINI from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX from calibre.devices.nook.driver import NOOK from calibre.devices.prs505.driver import PRS505 @@ -520,6 +520,7 @@ plugins += [ IREXDR1000, IREXDR800, JETBOOK, + JETBOOK_MINI, MIBUK, SHINEBOOK, POCKETBOOK360, diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py index 956d18e903..24e606e022 100644 --- a/src/calibre/devices/__init__.py +++ b/src/calibre/devices/__init__.py @@ -95,13 +95,19 @@ def debug(ioreg_to_tmp=False, buf=None): ioreg += 'Output from osx_get_usb_drives:\n'+drives+'\n\n' ioreg += Device.run_ioreg() connected_devices = [] - for dev in sorted(device_plugins(), cmp=lambda - x,y:cmp(x.__class__.__name__, y.__class__.__name__)): - out('Looking for', dev.__class__.__name__) + devplugins = list(sorted(device_plugins(), cmp=lambda + x,y:cmp(x.__class__.__name__, y.__class__.__name__))) + out('Available plugins:', ' '.join([x.__class__.__name__ for x in + devplugins])) + out(' ') + out('Looking for devices...') + for dev in devplugins: connected, det = s.is_device_connected(dev, debug=True) if connected: + out('\t\tDetected possible device', dev.__class__.__name__) connected_devices.append((dev, det)) + out(' ') errors = {} success = False out('Devices possibly connected:', end=' ') diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index 6ee1c07464..5fd3929aaf 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -99,4 +99,27 @@ class MIBUK(USBMS): VENDOR_NAME = 'LINUX' WINDOWS_MAIN_MEM = 'WOLDERMIBUK' +class JETBOOK_MINI(USBMS): + + ''' + ['0x4b8', + '0x507', + '0x100', + 'ECTACO', + 'ECTACO ATA/ATAPI Bridge (Bulk-Only)', + 'Rev.0.20'] + ''' + FORMATS = ['fb2', 'txt'] + + name = 'JetBook Mini' + description = _('Communicate with the JetBook Mini reader.') + author = 'Kovid Goyal' + + VENDOR_ID = [0x4b8] + PRODUCT_ID = [0x507] + BCD = [0x100] + VENDOR_NAME = 'ECTACO' + WINDOWS_MAIN_MEM = '' # Matches PROD_ + SUPPORTS_SUB_DIRS = True + diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index ef58ec3a90..37b7c7bd7c 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -73,6 +73,14 @@ class JetBook(Device): manufacturer = 'Ectaco' id = 'jetbook' +class JetBookMini(Device): + + output_profile = 'jetbook5' + output_format = 'FB2' + name = 'JetBook Mini' + manufacturer = 'Ectaco' + id = 'jetbookmini' + class KindleDX(Kindle): output_profile = 'kindle_dx' From fce4ab97b696ef3d2addb04643980266272b4380 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 18:50:02 -0600 Subject: [PATCH 177/235] ... --- src/calibre/devices/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py index 24e606e022..1918a36cc8 100644 --- a/src/calibre/devices/__init__.py +++ b/src/calibre/devices/__init__.py @@ -56,6 +56,7 @@ def get_connected_device(): return dev def debug(ioreg_to_tmp=False, buf=None): + import textwrap from calibre.customize.ui import device_plugins from calibre.devices.scanner import DeviceScanner, win_pnp_drives from calibre.constants import iswindows, isosx, __version__ @@ -97,8 +98,8 @@ def debug(ioreg_to_tmp=False, buf=None): connected_devices = [] devplugins = list(sorted(device_plugins(), cmp=lambda x,y:cmp(x.__class__.__name__, y.__class__.__name__))) - out('Available plugins:', ' '.join([x.__class__.__name__ for x in - devplugins])) + out('Available plugins:', textwrap.fill(' '.join([x.__class__.__name__ for x in + devplugins]))) out(' ') out('Looking for devices...') for dev in devplugins: From 1c9335aa5ec10a1bc2dba97bed55513c9550669f Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 19:03:54 -0600 Subject: [PATCH 178/235] Fix regression that caused the filename to not be set as the title when reading metadata fails --- src/calibre/ebooks/metadata/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py index 68deca5e10..b02ae2dbff 100644 --- a/src/calibre/ebooks/metadata/meta.py +++ b/src/calibre/ebooks/metadata/meta.py @@ -181,7 +181,7 @@ def metadata_from_filename(name, pat=None): mi.isbn = si except (IndexError, ValueError): pass - if not mi.title: + if mi.is_null('title'): mi.title = name return mi From 3018b6ac7c4f7b026d5ca847734653faa1e4d0b7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Tue, 28 Sep 2010 19:07:08 -0600 Subject: [PATCH 179/235] ... --- src/calibre/devices/jetbook/driver.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index 5fd3929aaf..f108de3347 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -111,7 +111,8 @@ class JETBOOK_MINI(USBMS): ''' FORMATS = ['fb2', 'txt'] - name = 'JetBook Mini' + gui_name = 'JetBook Mini' + name = 'JetBook Mini Device Interface' description = _('Communicate with the JetBook Mini reader.') author = 'Kovid Goyal' @@ -120,6 +121,8 @@ class JETBOOK_MINI(USBMS): BCD = [0x100] VENDOR_NAME = 'ECTACO' WINDOWS_MAIN_MEM = '' # Matches PROD_ + MAIN_MEMORY_VOLUME_LABEL = 'Jetbook Mini' + SUPPORTS_SUB_DIRS = True From 700dbe7df7fb8b43b6392870aaaec900f0a234e8 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 12:51:18 +0100 Subject: [PATCH 180/235] 1) add dirtied when renaming items 2) make bulk edit use the GUI thread 3) add a 'books remaiing' menu item --- src/calibre/gui2/actions/choose_library.py | 21 +- src/calibre/gui2/dialogs/metadata_bulk.py | 241 +++++++++++++-------- src/calibre/library/caches.py | 38 ++-- src/calibre/library/custom_columns.py | 2 + src/calibre/library/database2.py | 48 +++- 5 files changed, 236 insertions(+), 114 deletions(-) diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py index 79406da40c..d3045fecf4 100644 --- a/src/calibre/gui2/actions/choose_library.py +++ b/src/calibre/gui2/actions/choose_library.py @@ -14,7 +14,7 @@ from calibre import isbytestring from calibre.constants import filesystem_encoding from calibre.utils.config import prefs from calibre.gui2 import gprefs, warning_dialog, Dispatcher, error_dialog, \ - question_dialog + question_dialog, info_dialog from calibre.gui2.actions import InterfaceAction class LibraryUsageStats(object): @@ -115,6 +115,14 @@ class ChooseLibraryAction(InterfaceAction): type=Qt.QueuedConnection) self.choose_menu.addAction(ac) + self.rename_separator = self.choose_menu.addSeparator() + + self.create_action(spec=(_('Library backup status...'), 'lt.png', None, + None), attr='action_backup_status') + self.action_backup_status.triggered.connect(self.backup_status, + type=Qt.QueuedConnection) + self.choose_menu.addAction(self.action_backup_status) + def library_name(self): db = self.gui.library_view.model().db path = db.library_path @@ -206,6 +214,17 @@ class ChooseLibraryAction(InterfaceAction): self.stats.remove(location) self.build_menus() + def backup_status(self, location): + dirty_text = 'no' + try: + print 'here' + dirty_text = \ + unicode(self.gui.library_view.model().db.dirty_queue_length()) + except: + dirty_text = _('none') + info_dialog(self.gui, _('Backup status'), '<p>'+ + _('Book metadata files remaining to be written: %s') % dirty_text, + show=True) def switch_requested(self, location): if not self.change_library_allowed(): diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index b0ce0a1e6d..4fc85f2b30 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -3,42 +3,109 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' '''Dialog to edit metadata in bulk''' -from threading import Thread -import re, string +import re -from PyQt4.Qt import Qt, QDialog, QGridLayout +from PyQt4.Qt import Qt, QDialog, QGridLayout, QVBoxLayout, QFont, QLabel, \ + pyqtSignal from PyQt4 import QtGui from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog from calibre.gui2.dialogs.tag_editor import TagEditor from calibre.ebooks.metadata import string_to_authors, authors_to_string from calibre.gui2.custom_column_widgets import populate_metadata_page -from calibre.gui2.dialogs.progress import BlockingBusy -from calibre.gui2 import error_dialog, Dispatcher +from calibre.gui2 import error_dialog +from calibre.gui2.progress_indicator import ProgressIndicator from calibre.utils.config import dynamic -class Worker(Thread): +class MyBlockingBusy(QDialog): + + do_one_signal = pyqtSignal() + + phases = ['', + _('Title/Author'), + _('Standard metadata'), + _('Custom metadata'), + _('Search/Replace'), + ] + + def __init__(self, msg, args, db, ids, cc_widgets, s_r_func, + parent=None, window_title=_('Working')): + QDialog.__init__(self, parent) + + self._layout = QVBoxLayout() + self.setLayout(self._layout) + self.msg_text = msg + self.msg = QLabel(msg+' ') # Ensure dialog is wide enough + #self.msg.setWordWrap(True) + self.font = QFont() + self.font.setPointSize(self.font.pointSize() + 8) + self.msg.setFont(self.font) + self.pi = ProgressIndicator(self) + self.pi.setDisplaySize(100) + self._layout.addWidget(self.pi, 0, Qt.AlignHCenter) + self._layout.addSpacing(15) + self._layout.addWidget(self.msg, 0, Qt.AlignHCenter) + self.setWindowTitle(window_title) + self.resize(self.sizeHint()) + self.start() - def __init__(self, args, db, ids, cc_widgets, callback): - Thread.__init__(self) self.args = args self.db = db self.ids = ids self.error = None - self.callback = callback self.cc_widgets = cc_widgets + self.s_r_func = s_r_func + self.do_one_signal.connect(self.do_one_safe, Qt.QueuedConnection) - def doit(self): + def start(self): + self.pi.startAnimation() + + def stop(self): + self.pi.stopAnimation() + + def accept(self): + self.stop() + return QDialog.accept(self) + + def exec_(self): + self.current_index = 0 + self.current_phase = 1 + self.do_one_signal.emit() + return QDialog.exec_(self) + + def do_one_safe(self): + try: + if self.current_index >= len(self.ids): + self.current_phase += 1 + self.current_index = 0 + if self.current_phase > 4: + self.db.commit() + return self.accept() + id = self.ids[self.current_index] + self.msg.setText(self.msg_text.format(self.phases[self.current_phase], + (self.current_index*100)/len(self.ids))) + self.do_one(id) + except Exception, err: + import traceback + try: + err = unicode(err) + except: + err = repr(err) + self.error = (err, traceback.format_exc()) + return self.accept() + + def do_one(self, id): remove, add, au, aus, do_aus, rating, pub, do_series, \ do_autonumber, do_remove_format, remove_format, do_swap_ta, \ do_remove_conv, do_auto_author, series, do_series_restart, \ series_start_value, do_title_case, clear_series = self.args + # first loop: do author and title. These will commit at the end of each # operation, because each operation modifies the file system. We want to # try hard to keep the DB and the file system in sync, even in the face # of exceptions or forced exits. - for id in self.ids: + if self.current_phase == 1: title_set = False if do_swap_ta: title = self.db.title(id, index_is_id=True) @@ -58,9 +125,8 @@ class Worker(Thread): self.db.set_title(id, title.title(), notify=False) if au: self.db.set_authors(id, string_to_authors(au), notify=False) - - # All of these just affect the DB, so we can tolerate a total rollback - for id in self.ids: + elif self.current_phase == 2: + # All of these just affect the DB, so we can tolerate a total rollback if do_auto_author: x = self.db.author_sort_from_book(id, index_is_id=True) if x: @@ -93,37 +159,19 @@ class Worker(Thread): if do_remove_conv: self.db.delete_conversion_options(id, 'PIPE', commit=False) - self.db.commit() + elif self.current_phase == 3: + # both of these are fast enough to just do them all + for w in self.cc_widgets: + w.commit(self.ids) + self.db.bulk_modify_tags(self.ids, add=add, remove=remove, + notify=False) + self.current_index = len(self.ids) + elif self.current_phase == 4: + self.s_r_func(id) + # do the next one + self.current_index += 1 + self.do_one_signal.emit() - for w in self.cc_widgets: - w.commit(self.ids) - self.db.bulk_modify_tags(self.ids, add=add, remove=remove, - notify=False) - - def run(self): - try: - self.doit() - except Exception, err: - import traceback - try: - err = unicode(err) - except: - err = repr(err) - self.error = (err, traceback.format_exc()) - - self.callback() - -class SafeFormat(string.Formatter): - ''' - Provides a format function that substitutes '' for any missing value - ''' - def get_value(self, key, args, vals): - v = vals.get(key, None) - if v is None: - return '' - if isinstance(v, (tuple, list)): - v = ','.join(v) - return v class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): @@ -452,7 +500,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.s_r_set_colors() break - def do_search_replace(self): + def do_search_replace(self, id): source = unicode(self.search_field.currentText()) if not source or not self.s_r_obj: return @@ -461,48 +509,45 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): dest = source dfm = self.db.field_metadata[dest] - for id in self.ids: - mi = self.db.get_metadata(id, index_is_id=True,) - val = mi.get(source) - if val is None: - continue - val = self.s_r_do_regexp(mi) - val = self.s_r_do_destination(mi, val) - if dfm['is_multiple']: - if dfm['is_custom']: - # The standard tags and authors values want to be lists. - # All custom columns are to be strings - val = dfm['is_multiple'].join(val) - if dest == 'authors' and len(val) == 0: - error_dialog(self, _('Search/replace invalid'), - _('Authors cannot be set to the empty string. ' - 'Book title %s not processed')%mi.title, - show=True) - continue - else: - val = self.s_r_replace_mode_separator().join(val) - if dest == 'title' and len(val) == 0: - error_dialog(self, _('Search/replace invalid'), - _('Title cannot be set to the empty string. ' - 'Book title %s not processed')%mi.title, - show=True) - continue - + mi = self.db.get_metadata(id, index_is_id=True,) + val = mi.get(source) + if val is None: + return + val = self.s_r_do_regexp(mi) + val = self.s_r_do_destination(mi, val) + if dfm['is_multiple']: if dfm['is_custom']: - extra = self.db.get_custom_extra(id, label=dfm['label'], index_is_id=True) - self.db.set_custom(id, val, label=dfm['label'], extra=extra, - commit=False) + # The standard tags and authors values want to be lists. + # All custom columns are to be strings + val = dfm['is_multiple'].join(val) + if dest == 'authors' and len(val) == 0: + error_dialog(self, _('Search/replace invalid'), + _('Authors cannot be set to the empty string. ' + 'Book title %s not processed')%mi.title, + show=True) + return + else: + val = self.s_r_replace_mode_separator().join(val) + if dest == 'title' and len(val) == 0: + error_dialog(self, _('Search/replace invalid'), + _('Title cannot be set to the empty string. ' + 'Book title %s not processed')%mi.title, + show=True) + return + + if dfm['is_custom']: + extra = self.db.get_custom_extra(id, label=dfm['label'], index_is_id=True) + self.db.set_custom(id, val, label=dfm['label'], extra=extra, + commit=False) + else: + if dest == 'comments': + setter = self.db.set_comment else: - if dest == 'comments': - setter = self.db.set_comment - else: - setter = getattr(self.db, 'set_'+dest) - if dest in ['title', 'authors']: - setter(id, val, notify=False) - else: - setter(id, val, notify=False, commit=False) - self.db.commit() - dynamic['s_r_search_mode'] = self.search_mode.currentIndex() + setter = getattr(self.db, 'set_'+dest) + if dest in ['title', 'authors']: + setter(id, val, notify=False) + else: + setter(id, val, notify=False, commit=False) def create_custom_column_editors(self): w = self.central_widget.widget(1) @@ -525,11 +570,11 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): def initalize_authors(self): all_authors = self.db.all_authors() - all_authors.sort(cmp=lambda x, y : cmp(x[1], y[1])) + all_authors.sort(cmp=lambda x, y : cmp(x[1].lower(), y[1].lower())) for i in all_authors: id, name = i - name = authors_to_string([name.strip().replace('|', ',') for n in name.split(',')]) + name = name.strip().replace('|', ',') self.authors.addItem(name) self.authors.setEditText('') @@ -613,28 +658,32 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): do_remove_conv, do_auto_author, series, do_series_restart, series_start_value, do_title_case, clear_series) - bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') - %len(self.ids), parent=self) - self.worker = Worker(args, self.db, self.ids, +# bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') +# %len(self.ids), parent=self) +# self.worker = Worker(args, self.db, self.ids, +# getattr(self, 'custom_column_widgets', []), +# Dispatcher(bb.accept, parent=bb)) + + bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.') + %len(self.ids), args, self.db, self.ids, getattr(self, 'custom_column_widgets', []), - Dispatcher(bb.accept, parent=bb)) + self.do_search_replace, parent=self) # The metadata backup thread causes database commits # which can slow down bulk editing of large numbers of books self.model.stop_metadata_backup() try: - self.worker.start() +# self.worker.start() bb.exec_() finally: self.model.start_metadata_backup() - if self.worker.error is not None: + if bb.error is not None: return error_dialog(self, _('Failed'), - self.worker.error[0], det_msg=self.worker.error[1], + bb.error[0], det_msg=bb.error[1], show=True) - self.do_search_replace() - + dynamic['s_r_search_mode'] = self.search_mode.currentIndex() self.db.clean() return QDialog.accept(self) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 281d1485b7..a36dbe57a9 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -138,25 +138,37 @@ class CoverCache(Thread): # {{{ def run(self): while self.keep_running: try: - time.sleep(0.050) # Limit 20/second to not overwhelm the GUI + # The GUI puts the same ID into the queue many times. The code + # below emptys the queue, building a set of unique values. When + # the queue is empty, do the work + ids = set() id_ = self.load_queue.get(True, 2) + ids.add(id_) + try: + while True: + # Give the gui some time to put values into the queue + id_ = self.load_queue.get(True, 0.5) + ids.add(id_) + except Empty: + pass except Empty: continue except: #Happens during interpreter shutdown break - try: - img = self._image_for_id(id_) - except: - import traceback - traceback.print_exc() - continue - try: - with self.lock: - self.cache[id_] = img - except: - # Happens during interpreter shutdown - break + for id_ in ids: + time.sleep(0.050) # Limit 20/second to not overwhelm the GUI + try: + img = self._image_for_id(id_) + except: + traceback.print_exc() + continue + try: + with self.lock: + self.cache[id_] = img + except: + # Happens during interpreter shutdown + break def set_cache(self, ids): with self.lock: diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index 97c8565177..fdd78e89f8 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -214,6 +214,7 @@ class CustomColumns(object): 'SELECT id FROM %s WHERE value=?'%table, (new_name,), all=False) if new_id is None or old_id == new_id: self.conn.execute('UPDATE %s SET value=? WHERE id=?'%table, (new_name, old_id)) + new_id = old_id else: # New id exists. If the column is_multiple, then process like # tags, otherwise process like publishers (see database2) @@ -226,6 +227,7 @@ class CustomColumns(object): self.conn.execute('''UPDATE %s SET value=? WHERE value=?'''%lt, (new_id, old_id,)) self.conn.execute('DELETE FROM %s WHERE id=?'%table, (old_id,)) + self.dirty_books_referencing('#'+data['label'], new_id, commit=False) self.conn.commit() def delete_custom_item_using_id(self, id, label=None, num=None): diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 192de21df3..85fb955448 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -47,13 +47,21 @@ def delete_file(path): def delete_tree(path, permanent=False): if permanent: - shutil.rmtree(path) + try: + # For completely mysterious reasons, sometimes a file is left open + # leading to access errors. If we get an exception, wait and hope + # that whatever has the file (the O/S?) lets go of it. + shutil.rmtree(path) + except: + traceback.print_exc() + time.sleep(1) + shutil.rmtree(path) else: try: if not permanent: winshell.delete_file(path, silent=True, no_confirm=True) except: - shutil.rmtree(path) + delete_tree(path, permanent=True) copyfile = os.link if hasattr(os, 'link') else shutil.copyfile @@ -520,6 +528,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): try: f = open(path, 'rb') except (IOError, OSError): + try: + f.close() + print 'cover exception left file open!', path + except: + pass time.sleep(0.2) f = open(path, 'rb') if as_image: @@ -627,6 +640,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if commit: self.conn.commit() + def dirty_queue_length(self): + return len(self.dirtied_cache) + def commit_dirty_cache(self): ''' Set the dirty indication for every book in the cache. The vast majority @@ -1286,7 +1302,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): val=mi.get(key), extra=mi.get_extra(key), label=user_mi[key]['label'], commit=False) - self.commit() + self.conn.commit() self.notify('metadata', [id]) def authors_sort_strings(self, id, index_is_id=False): @@ -1444,6 +1460,19 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # Convenience methods for tags_list_editor # Note: we generally do not need to refresh_ids because library_view will # refresh everything. + + def dirty_books_referencing(self, field, id, commit=True): + # Get the list of books to dirty -- all books that reference the item + table = self.field_metadata[field]['table'] + link = self.field_metadata[field]['link_column'] + bks = self.conn.get( + 'SELECT book from books_{0}_link WHERE {1}=?'.format(table, link), + (id,)) + books = [] + for (book_id,) in bks: + books.append(book_id) + self.dirtied(books, commit=commit) + def get_tags_with_ids(self): result = self.conn.get('SELECT id,name FROM tags') if not result: @@ -1460,6 +1489,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # there is a change of case self.conn.execute('''UPDATE tags SET name=? WHERE id=?''', (new_name, old_id)) + self.dirty_books_referencing('tags', new_id, commit=False) + new_id = old_id else: # It is possible that by renaming a tag, the tag will appear # twice on a book. This will throw an integrity error, aborting @@ -1477,9 +1508,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): WHERE tag=?''',(new_id, old_id,)) # Get rid of the no-longer used publisher self.conn.execute('DELETE FROM tags WHERE id=?', (old_id,)) + self.dirty_books_referencing('tags', new_id, commit=False) self.conn.commit() def delete_tag_using_id(self, id): + self.dirty_books_referencing('tags', id, commit=False) self.conn.execute('DELETE FROM books_tags_link WHERE tag=?', (id,)) self.conn.execute('DELETE FROM tags WHERE id=?', (id,)) self.conn.commit() @@ -1496,6 +1529,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): '''SELECT id from series WHERE name=?''', (new_name,), all=False) if new_id is None or old_id == new_id: + new_id = old_id self.conn.execute('UPDATE series SET name=? WHERE id=?', (new_name, old_id)) else: @@ -1519,15 +1553,17 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): SET series_index=? WHERE id=?''',(index, book_id,)) index = index + 1 + self.dirty_books_referencing('series', new_id, commit=False) self.conn.commit() def delete_series_using_id(self, id): + self.dirty_books_referencing('series', id, commit=False) books = self.conn.get('SELECT book from books_series_link WHERE series=?', (id,)) self.conn.execute('DELETE FROM books_series_link WHERE series=?', (id,)) self.conn.execute('DELETE FROM series WHERE id=?', (id,)) - self.conn.commit() for (book_id,) in books: self.conn.execute('UPDATE books SET series_index=1.0 WHERE id=?', (book_id,)) + self.conn.commit() def get_publishers_with_ids(self): result = self.conn.get('SELECT id,name FROM publishers') @@ -1541,6 +1577,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): '''SELECT id from publishers WHERE name=?''', (new_name,), all=False) if new_id is None or old_id == new_id: + new_id = old_id # New name doesn't exist. Simply change the old name self.conn.execute('UPDATE publishers SET name=? WHERE id=?', \ (new_name, old_id)) @@ -1551,9 +1588,11 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): WHERE publisher=?''',(new_id, old_id,)) # Get rid of the no-longer used publisher self.conn.execute('DELETE FROM publishers WHERE id=?', (old_id,)) + self.dirty_books_referencing('publisher', new_id, commit=False) self.conn.commit() def delete_publisher_using_id(self, old_id): + self.dirty_books_referencing('publisher', id, commit=False) self.conn.execute('''DELETE FROM books_publishers_link WHERE publisher=?''', (old_id,)) self.conn.execute('DELETE FROM publishers WHERE id=?', (old_id,)) @@ -1634,6 +1673,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # Now delete the old author from the DB bks = self.conn.get('SELECT book FROM books_authors_link WHERE author=?', (old_id,)) self.conn.execute('DELETE FROM authors WHERE id=?', (old_id,)) + self.dirtied(books, commit=False) self.conn.commit() # the authors are now changed, either by changing the author's name # or replacing the author in the list. Now must fix up the books. From 5aadbb2dcd311272f9230b1b9149ed4833c6ff47 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 14:33:11 +0100 Subject: [PATCH 181/235] 1) change plugboards to templates (pass one) 2) fix recursion detection in base.py 3) fix lack of refresh in model when editing custom fields on the GUI 4) change the name of the plugboard eval function in base.py 5) move recursion detection base code to formatter --- src/calibre/ebooks/metadata/book/base.py | 55 +++++++++++------------ src/calibre/gui2/device.py | 2 +- src/calibre/gui2/library/models.py | 4 +- src/calibre/gui2/preferences/plugboard.py | 36 +++++++-------- src/calibre/gui2/preferences/plugboard.ui | 5 ++- src/calibre/library/caches.py | 4 +- src/calibre/library/save_to_disk.py | 9 +--- src/calibre/utils/formatter.py | 5 +++ 8 files changed, 59 insertions(+), 61 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 951a55da10..56df573cee 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -37,7 +37,13 @@ class SafeFormat(TemplateFormatter): def get_value(self, key, args, kwargs): try: - ign, v = self.book.format_field(key.lower(), series_with_index=False) + b = self.book.get_user_metadata(key, False) + if b and b['datatype'] == 'int' and self.book.get(key, 0) == 0: + v = '' + elif b and b['datatype'] == 'float' and b.get(key, 0.0) == 0.0: + v = '' + else: + ign, v = self.book.format_field(key.lower(), series_with_index=False) if v is None: return '' if v == '': @@ -65,7 +71,6 @@ class Metadata(object): ''' _data = copy.deepcopy(NULL_VALUES) object.__setattr__(self, '_data', _data) - _data['_curseq'] = _data['_compseq'] = 0 if other is not None: self.smart_update(other) else: @@ -94,29 +99,22 @@ class Metadata(object): if field in _data['user_metadata'].iterkeys(): d = _data['user_metadata'][field] val = d['#value#'] - if d['datatype'] != 'composite' or \ - (_data['_curseq'] == _data['_compseq'] and val is not None): + if d['datatype'] != 'composite': return val - # Data in the structure has changed. Recompute the composite fields - _data['_compseq'] = _data['_curseq'] - for ck in _data['user_metadata']: - cf = _data['user_metadata'][ck] - if cf['datatype'] != 'composite': - continue - cf['#value#'] = 'RECURSIVE_COMPOSITE FIELD ' + field - cf['#value#'] = composite_formatter.safe_format( - cf['display']['composite_template'], + if val is None: + d['#value#'] = 'RECURSIVE_COMPOSITE FIELD (Metadata) ' + field + val = d['#value#'] = composite_formatter.safe_format( + d['display']['composite_template'], self, _('TEMPLATE ERROR'), self).strip() - return d['#value#'] + return val raise AttributeError( 'Metadata object has no attribute named: '+ repr(field)) def __setattr__(self, field, val, extra=None): _data = object.__getattribute__(self, '_data') - _data['_curseq'] += 1 if field in TOP_LEVEL_CLASSIFIERS: _data['classifiers'].update({field: val}) elif field in STANDARD_METADATA_FIELDS: @@ -124,7 +122,10 @@ class Metadata(object): val = NULL_VALUES.get(field, None) _data[field] = val elif field in _data['user_metadata'].iterkeys(): - _data['user_metadata'][field]['#value#'] = val + if _data['user_metadata'][field]['datatype'] == 'composite': + _data['user_metadata'][field]['#value#'] = None + else: + _data['user_metadata'][field]['#value#'] = val _data['user_metadata'][field]['#extra#'] = extra else: # You are allowed to stick arbitrary attributes onto this object as @@ -294,28 +295,24 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') _data['user_metadata'][field] = metadata - def copy_specific_attributes(self, other, attrs): + def template_to_attribute(self, other, attrs): ''' - Takes a dict {src:dest, src:dest} and copys other[src] to self[dest]. - This is on a best-efforts basis. Some assignments can make no sense. + Takes a dict {src:dest, src:dest}, evaluates the template in the context + of other, then copies the result to self[dest]. This is on a best- + efforts basis. Some assignments can make no sense. ''' if not attrs: return for src in attrs: try: - sfm = other.metadata_for_field(src) + val = composite_formatter.safe_format\ + (src, other, 'PLUGBOARD TEMPLATE ERROR', other) dfm = self.metadata_for_field(attrs[src]) if dfm['is_multiple']: - if sfm['is_multiple']: - self.set(attrs[src], other.get(src)) - else: - self.set(attrs[src], - [f.strip() for f in other.get(src).split(',') - if f.strip()]) - elif sfm['is_multiple']: - self.set(attrs[src], ','.join(other.get(src))) + self.set(attrs[src], + [f.strip() for f in val.split(',') if f.strip()]) else: - self.set(attrs[src], other.get(src)) + self.set(attrs[src], val) except: traceback.print_exc() pass diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 4c866b1855..3da4fddb5d 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -349,7 +349,7 @@ class DeviceManager(Thread): # {{{ with open(f, 'r+b') as stream: if cpb: newmi = mi.deepcopy() - newmi.copy_specific_attributes(mi, cpb) + newmi.template_to_attribute(mi, cpb) else: newmi = mi set_metadata(stream, newmi, stream_type=ext) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 9da5420681..a808fd9c43 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -750,8 +750,10 @@ class BooksModel(QAbstractTableModel): # {{{ self.refresh(reset=True) return True - self.db.set_custom(self.db.id(row), val, extra=s_index, + id = self.db.id(row) + self.db.set_custom(id, val, extra=s_index, label=label, num=None, append=False, notify=True) + self.refresh_ids([id], current_row=row) return True def setData(self, index, value, role): diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 124654b643..011131ae48 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -56,18 +56,19 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.formats.insert(1, plugboard_any_format_value) self.new_format.addItems(self.formats) - self.fields = [''] - for f in self.db.all_field_keys(): - if self.db.field_metadata[f].get('rec_index', None) is not None and\ - self.db.field_metadata[f]['datatype'] is not None and \ - self.db.field_metadata[f]['search_terms']: - self.fields.append(f) - self.fields.sort(cmp=field_cmp) + self.source_fields = [''] + for f in self.db.custom_field_keys(): + if self.db.field_metadata[f]['datatype'] == 'composite': + self.source_fields.append(f) + self.source_fields.sort(cmp=field_cmp) + + self.dest_fields = ['', 'authors', 'author_sort', 'publisher', + 'tags', 'title'] self.source_widgets = [] self.dest_widgets = [] for i in range(0, 10): - w = QtGui.QComboBox(self) + w = QtGui.QLineEdit(self) self.source_widgets.append(w) self.fields_layout.addWidget(w, 5+i, 0, 1, 1) w = QtGui.QComboBox(self) @@ -101,14 +102,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.ok_button.setEnabled(True) self.del_button.setEnabled(True) for w in self.source_widgets: - w.addItems(self.fields) + w.clear() for w in self.dest_widgets: - w.addItems(self.fields) + w.addItems(self.dest_fields) def set_field(self, i, src, dst): - idx = self.fields.index(src) - self.source_widgets[i].setCurrentIndex(idx) - idx = self.fields.index(dst) + self.source_widgets[i].setText(src) + idx = self.dest_fields.index(dst) self.dest_widgets[i].setCurrentIndex(idx) def edit_device_changed(self, txt): @@ -216,11 +216,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): def ok_clicked(self): pb = {} for i in range(0, len(self.source_widgets)): - s = self.source_widgets[i].currentIndex() - if s != 0: + s = unicode(self.source_widgets[i].text()) + if s: d = self.dest_widgets[i].currentIndex() if d != 0: - pb[self.fields[s]] = self.fields[d] + pb[s] = self.dest_fields[d] if len(pb) == 0: if self.current_format in self.current_plugboards: fpb = self.current_plugboards[self.current_format] @@ -266,9 +266,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if d not in self.current_plugboards[f]: continue ops = [] - for op in self.fields: - if op not in self.current_plugboards[f][d]: - continue + for op in self.current_plugboards[f][d]: ops.append(op + '->' + self.current_plugboards[f][d][op]) txt += '%s:%s [%s]\n'%(f, d, ', '.join(ops)) self.existing_plugboards.setPlainText(txt) diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index f88af8ff50..79a07be1f7 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -87,6 +87,9 @@ <property name="lineWrapMode"> <enum>QPlainTextEdit::NoWrap</enum> </property> + <property name="readOnly"> + <bool>true</bool> + </property> </widget> </item> <item row="4" column="0"> @@ -109,7 +112,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> - <string>Source field</string> + <string>Source template</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index a36dbe57a9..42720c5e83 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -672,7 +672,7 @@ class ResultCache(SearchQueryParser): # {{{ if len(self.composites) > 0: mi = db.get_metadata(id, index_is_id=True) for k,c in self.composites: - self._data[id][c] = mi.format_field(k)[1] + self._data[id][c] = mi.get(k) self._map[0:0] = ids self._map_filtered[0:0] = ids @@ -702,7 +702,7 @@ class ResultCache(SearchQueryParser): # {{{ if len(self.composites) > 0: mi = db.get_metadata(item[0], index_is_id=True) for k,c in self.composites: - item[c] = mi.format_field(k)[1] + item[c] = mi.get(k) self._map = [i[0] for i in self._data if i is not None] if field is not None: diff --git a/src/calibre/library/save_to_disk.py b/src/calibre/library/save_to_disk.py index a2c8a62694..113ebf823a 100644 --- a/src/calibre/library/save_to_disk.py +++ b/src/calibre/library/save_to_disk.py @@ -112,8 +112,6 @@ class SafeFormat(TemplateFormatter): Provides a format function that substitutes '' for any missing value ''' - composite_values = {} - def get_value(self, key, args, kwargs): try: b = self.book.get_user_metadata(key, False) @@ -131,11 +129,6 @@ class SafeFormat(TemplateFormatter): except: return '' - def safe_format(self, fmt, kwargs, error_value, book, sanitize=None): - self.composite_values = {} - return TemplateFormatter.safe_format(self, fmt, kwargs, error_value, - book, sanitize) - safe_formatter = SafeFormat() def get_components(template, mi, id, timefmt='%b %Y', length=250, @@ -279,7 +272,7 @@ def save_book_to_disk(id, db, root, opts, length): try: if cpb: newmi = mi.deepcopy() - newmi.copy_specific_attributes(mi, cpb) + newmi.template_to_attribute(mi, cpb) else: newmi = mi set_metadata(stream, newmi, fmt) diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index f95a6deee5..502574dd3c 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -11,6 +11,10 @@ class TemplateFormatter(string.Formatter): Provides a format function that substitutes '' for any missing value ''' + # Dict to do recursion detection. It is up the the individual get_value + # method to use it. It is cleared when starting to format a template + composite_values = {} + def __init__(self): string.Formatter.__init__(self) self.book = None @@ -114,6 +118,7 @@ class TemplateFormatter(string.Formatter): self.kwargs = kwargs self.book = book self.sanitize = sanitize + self.composite_values = {} try: ans = self.vformat(fmt, [], kwargs).strip() except: From 1b41568d4c9aa67331041a09210faa1299345e29 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 15:12:01 +0100 Subject: [PATCH 182/235] 1) Add validation to plugboard gui 2) allow plugboards to use metadata fields with no field metadata (e.g., language) --- src/calibre/ebooks/metadata/book/base.py | 2 +- src/calibre/gui2/preferences/plugboard.py | 21 ++++++- src/calibre/gui2/preferences/plugboard.ui | 76 ++++++++++++++++++----- 3 files changed, 81 insertions(+), 18 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 56df573cee..17aa2d5603 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -308,7 +308,7 @@ class Metadata(object): val = composite_formatter.safe_format\ (src, other, 'PLUGBOARD TEMPLATE ERROR', other) dfm = self.metadata_for_field(attrs[src]) - if dfm['is_multiple']: + if dfm and dfm['is_multiple']: self.set(attrs[src], [f.strip() for f in val.split(',') if f.strip()]) else: diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 011131ae48..3742eb24d0 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -13,6 +13,7 @@ from calibre.gui2.preferences.plugboard_ui import Ui_Form from calibre.customize.ui import metadata_writers, device_plugins from calibre.library.save_to_disk import plugboard_any_format_value, \ plugboard_any_device_value, plugboard_save_to_disk_value +from calibre.utils.formatter import validation_formatter class ConfigWidget(ConfigWidgetBase, Ui_Form): @@ -62,12 +63,13 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.source_fields.append(f) self.source_fields.sort(cmp=field_cmp) - self.dest_fields = ['', 'authors', 'author_sort', 'publisher', - 'tags', 'title'] + self.dest_fields = ['', + 'authors', 'author_sort', 'language', 'publisher', + 'tags', 'title', 'title_sort'] self.source_widgets = [] self.dest_widgets = [] - for i in range(0, 10): + for i in range(0, len(self.dest_fields)-1): w = QtGui.QLineEdit(self) self.source_widgets.append(w) self.fields_layout.addWidget(w, 5+i, 0, 1, 1) @@ -220,7 +222,20 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): if s: d = self.dest_widgets[i].currentIndex() if d != 0: + try: + validation_formatter.validate(s) + except Exception, err: + error_dialog(self, _('Invalid template'), + '<p>'+_('The template %s is invalid:')%s + \ + '<br>'+str(err), show=True) + return pb[s] = self.dest_fields[d] + else: + error_dialog(self, _('Invalid destination'), + '<p>'+_('The destination field cannot be blank'), + show=True) + return + if len(pb) == 0: if self.current_format in self.current_plugboards: fpb = self.current_plugboards[self.current_format] diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index 79a07be1f7..4a3192aab5 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -17,7 +17,12 @@ <item row="0" column="0" colspan="2"> <widget class="QLabel" name="label"> <property name="text"> - <string>Here you can control what metadata calibre uses when saving or sending books:</string> + <string>Here you can change the metadata calibre uses when saving or sending books. One possibility is to alter the title to contain series informaton. Another would be to change the author sort. + +Use this dialog to define for a format (or all formats) and a device (or all devices) the template to be used to find the value to assign to a destination field. Often the templates will contain simple references to composite columns, but this is not necessary. You can put arbitrary templates in the source box.</string> + </property> + <property name="textFormat"> + <enum>Qt::PlainText</enum> </property> <property name="wordWrap"> <bool>true</bool> @@ -129,7 +134,7 @@ </property> </widget> </item> - <item row="20" column="0"> + <item row="21" column="0"> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -143,18 +148,61 @@ </spacer> </item> <item row="19" column="0"> - <widget class="QPushButton" name="ok_button"> - <property name="text"> - <string>Save</string> - </property> - </widget> - </item> - <item row="19" column="1"> - <widget class="QPushButton" name="del_button"> - <property name="text"> - <string>Delete</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="ok_button"> + <property name="text"> + <string>Save plugboard</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="del_button"> + <property name="text"> + <string>Delete plugboard</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> </layout> </item> From 084b0cff49bdfbf3664881e69e4fe3692e0bfc29 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 15:21:02 +0100 Subject: [PATCH 183/235] Fix intro text a bit. --- src/calibre/gui2/preferences/plugboard.ui | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index 4a3192aab5..efe500aebd 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -17,9 +17,13 @@ <item row="0" column="0" colspan="2"> <widget class="QLabel" name="label"> <property name="text"> - <string>Here you can change the metadata calibre uses when saving or sending books. One possibility is to alter the title to contain series informaton. Another would be to change the author sort. + <string>Here you can change the metadata calibre uses to update a book when saving to disk or sending to device. -Use this dialog to define for a format (or all formats) and a device (or all devices) the template to be used to find the value to assign to a destination field. Often the templates will contain simple references to composite columns, but this is not necessary. You can put arbitrary templates in the source box.</string> +Use this dialog to define a 'plugboard' for for a format (or all formats) and a device (or all devices). The plugboard spefies what template is connected to what field. The template is used to find compute a value, and that value is assigned to the connected field. + +Often templates will contain simple references to composite columns, but this is not necessary. You can use any template in a source box that you can use elsewhere in calibre. + +One possible use for a plugboard is to alter the title to contain series informaton. Another would be to change the author sort, something that mobi users might do to force it to use the ';' that the kindle requires. A third would be to specify the language.</string> </property> <property name="textFormat"> <enum>Qt::PlainText</enum> @@ -29,7 +33,14 @@ Use this dialog to define for a format (or all formats) and a device (or all dev </property> </widget> </item> - <item row="1" column="0"> + <item row="1" column="0" colspan="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="2" column="0"> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="1"> <widget class="QLabel" name="label_6"> @@ -112,7 +123,7 @@ Use this dialog to define for a format (or all formats) and a device (or all dev </item> </layout> </item> - <item row="1" column="1"> + <item row="2" column="1"> <layout class="QGridLayout" name="fields_layout"> <item row="0" column="0"> <widget class="QLabel" name="label_2"> From 9cfe0bfaa2eaffcaf2df29acf4d3dd754a2e8f59 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 09:58:31 -0600 Subject: [PATCH 184/235] Lesoir and La Derniere Heure by Lionel Bergeret --- resources/recipes/dhnet_be.recipe | 34 +++++++++++++++++++++++ resources/recipes/lesoir_be.recipe | 43 ++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 resources/recipes/dhnet_be.recipe create mode 100644 resources/recipes/lesoir_be.recipe diff --git a/resources/recipes/dhnet_be.recipe b/resources/recipes/dhnet_be.recipe new file mode 100644 index 0000000000..a827ae307f --- /dev/null +++ b/resources/recipes/dhnet_be.recipe @@ -0,0 +1,34 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +dhnet.be +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class DHNetBe(BasicNewsRecipe): + title = u'La Derniere Heure' + __author__ = u'Lionel Bergeret' + description = u'News from Belgium in French' + publisher = u'dhnet.be' + category = 'news, Belgium' + oldest_article = 3 + language = 'fr' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'div', attrs = {'id': 'articleText'}) + ,dict(name = 'div', attrs = {'id': 'articlePicureAndLinks'}) + ] + + feeds = [ + (u'La Une' , u'http://www.dhnet.be/rss' ) + ,(u'La Une Sports' , u'http://www.dhnet.be/rss/dhsports/' ) + ,(u'La Une Info' , u'http://www.dhnet.be/rss/dhinfos/' ) + ] diff --git a/resources/recipes/lesoir_be.recipe b/resources/recipes/lesoir_be.recipe new file mode 100644 index 0000000000..600ef6bc29 --- /dev/null +++ b/resources/recipes/lesoir_be.recipe @@ -0,0 +1,43 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +lesoir.be +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class LeSoirBe(BasicNewsRecipe): + title = u'Le Soir' + __author__ = u'Lionel Bergeret' + description = u'News from Belgium in French' + publisher = u'lesoir.be' + category = 'news, Belgium' + oldest_article = 3 + language = 'fr' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'div', attrs = {'id': 'story_head'}) + ,dict(name = 'div', attrs = {'id': 'story_body'}) + ] + + remove_tags = [ + dict(name='form', attrs={'id':'story_actions'}) + ,dict(name='div', attrs={'id':'sb-share'}) + ,dict(name='div', attrs={'id':'sb-subscribe'}) + ] + + feeds = [ + (u'Belgique' , u'http://www.lesoir.be/actualite/belgique/rss.xml' ) + ,(u'France' , u'http://www.lesoir.be/actualite/france/rss.xml' ) + ,(u'Monde' , u'http://www.lesoir.be/actualite/monde/rss.xml' ) + ,(u'Regions' , u'http://www.lesoir.be/regions/rss.xml' ) + ,(u'Vie du Net' , u'http://www.lesoir.be/actualite/vie_du_net/rss.xml' ) + ,(u'Petite Gazette' , u'http://www.lesoir.be/actualite/sciences/rss.xml' ) + ] From bc2abb333b0cd053729f226cd8ec5adf1054d52f Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 18:59:07 +0100 Subject: [PATCH 185/235] Merge from trunk --- src/calibre/gui2/actions/choose_library.py | 1 - src/calibre/gui2/dialogs/metadata_bulk.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py index d3045fecf4..2f8beab976 100644 --- a/src/calibre/gui2/actions/choose_library.py +++ b/src/calibre/gui2/actions/choose_library.py @@ -217,7 +217,6 @@ class ChooseLibraryAction(InterfaceAction): def backup_status(self, location): dirty_text = 'no' try: - print 'here' dirty_text = \ unicode(self.gui.library_view.model().db.dirty_queue_length()) except: diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 4fc85f2b30..09a196ca58 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -658,12 +658,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): do_remove_conv, do_auto_author, series, do_series_restart, series_start_value, do_title_case, clear_series) -# bb = BlockingBusy(_('Applying changes to %d books. This may take a while.') -# %len(self.ids), parent=self) -# self.worker = Worker(args, self.db, self.ids, -# getattr(self, 'custom_column_widgets', []), -# Dispatcher(bb.accept, parent=bb)) - bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.') %len(self.ids), args, self.db, self.ids, getattr(self, 'custom_column_widgets', []), @@ -673,7 +667,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): # which can slow down bulk editing of large numbers of books self.model.stop_metadata_backup() try: -# self.worker.start() bb.exec_() finally: self.model.start_metadata_backup() From 77019c66bfc07b52eaca7210924e1d910c236486 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 12:03:37 -0600 Subject: [PATCH 186/235] ... --- src/calibre/library/database2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 08dd74af29..ca8824ae1c 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -1484,7 +1484,6 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): # there is a change of case self.conn.execute('''UPDATE tags SET name=? WHERE id=?''', (new_name, old_id)) - self.dirty_books_referencing('tags', new_id, commit=False) new_id = old_id else: # It is possible that by renaming a tag, the tag will appear From f75f02a933934453b1e2f028d6454b49b777a93e Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 19:04:37 +0100 Subject: [PATCH 187/235] Fix typo in plugboard UI --- src/calibre/gui2/preferences/plugboard.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index 6329a78ce1..f2ff6fb223 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -19,7 +19,7 @@ <property name="text"> <string>Here you can change the metadata calibre uses to update a book when saving to disk or sending to device. -Use this dialog to define a 'plugboard' for for a format (or all formats) and a device (or all devices). The plugboard spefies what template is connected to what field. The template is used to compute a value, and that value is assigned to the connected field. +Use this dialog to define a 'plugboard' for a format (or all formats) and a device (or all devices). The plugboard spefies what template is connected to what field. The template is used to compute a value, and that value is assigned to the connected field. Often templates will contain simple references to composite columns, but this is not necessary. You can use any template in a source box that you can use elsewhere in calibre. From 2f6fa5c8a8d763450d6ffcd2c68d77ceffae6a4e Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 12:49:52 -0600 Subject: [PATCH 188/235] Fix reselect after bulk edit very slow --- src/calibre/gui2/actions/edit_metadata.py | 5 ++- src/calibre/gui2/library/views.py | 48 +++++++++++------------ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index cc74b3c515..17c6da9a4c 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -188,8 +188,9 @@ class EditMetadataAction(InterfaceAction): finally: self.gui.tags_view.blockSignals(False) if changed: - self.gui.library_view.model().resort(reset=False) - self.gui.library_view.model().research() + m = self.gui.library_view.model() + m.resort(reset=False) + m.research() self.gui.tags_view.recount() if self.gui.cover_flow: self.gui.cover_flow.dataChanged() diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index b113866ecc..4b6bda1d2a 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -9,7 +9,7 @@ import os from functools import partial from PyQt4.Qt import QTableView, Qt, QAbstractItemView, QMenu, pyqtSignal, \ - QModelIndex, QIcon + QModelIndex, QIcon, QItemSelection from calibre.gui2.library.delegates import RatingDelegate, PubDateDelegate, \ TextDelegate, DateDelegate, TagsDelegate, CcTextDelegate, \ @@ -488,29 +488,29 @@ class BooksView(QTableView): # {{{ Select rows identified by identifiers. identifiers can be a set of ids, row numbers or QModelIndexes. ''' - selmode = self.selectionMode() - self.setSelectionMode(QAbstractItemView.MultiSelection) - try: - rows = set([x.row() if hasattr(x, 'row') else x for x in - identifiers]) - if using_ids: - rows = set([]) - identifiers = set(identifiers) - m = self.model() - for row in range(m.rowCount(QModelIndex())): - if m.id(row) in identifiers: - rows.add(row) - if rows: - row = list(sorted(rows))[0] - if change_current: - self.set_current_row(row, select=False) - if scroll: - self.scroll_to_row(row) - self.clearSelection() - for r in rows: - self.selectRow(r) - finally: - self.setSelectionMode(selmode) + rows = set([x.row() if hasattr(x, 'row') else x for x in + identifiers]) + if using_ids: + rows = set([]) + identifiers = set(identifiers) + m = self.model() + for row in xrange(m.rowCount(QModelIndex())): + if m.id(row) in identifiers: + rows.add(row) + rows = list(sorted(rows)) + if rows: + row = rows[0] + if change_current: + self.set_current_row(row, select=False) + if scroll: + self.scroll_to_row(row) + sm = self.selectionModel() + sel = QItemSelection() + m = self.model() + max_col = m.columnCount(QModelIndex()) - 1 + for row in rows: + sel.select(m.index(row, 0), m.index(row, max_col)) + sm.select(sel, sm.ClearAndSelect) def close(self): self._model.close() From 314b212b59b4e3e16a613fb02088b24c2d1bf92f Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 13:03:47 -0600 Subject: [PATCH 189/235] Tweak epub: Warning to close open files. --- src/calibre/gui2/dialogs/tweak_epub.ui | 8 ++--- src/calibre/utils/zipfile.py | 43 +++++++++++++------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/calibre/gui2/dialogs/tweak_epub.ui b/src/calibre/gui2/dialogs/tweak_epub.ui index ccd33f44ab..063460aaae 100644 --- a/src/calibre/gui2/dialogs/tweak_epub.ui +++ b/src/calibre/gui2/dialogs/tweak_epub.ui @@ -32,7 +32,7 @@ <string>&Explode ePub</string> </property> <property name="icon"> - <iconset> + <iconset resource="../../../../resources/images.qrc"> <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset> </property> </widget> @@ -49,7 +49,7 @@ <string>&Rebuild ePub</string> </property> <property name="icon"> - <iconset> + <iconset resource="../../../../resources/images.qrc"> <normaloff>:/images/exec.png</normaloff>:/images/exec.png</iconset> </property> </widget> @@ -63,7 +63,7 @@ <string>&Cancel</string> </property> <property name="icon"> - <iconset> + <iconset resource="../../../../resources/images.qrc"> <normaloff>:/images/window-close.png</normaloff>:/images/window-close.png</iconset> </property> </widget> @@ -71,7 +71,7 @@ <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window. Rebuild the ePub, updating your calibre library.</string> + <string><p>Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window <b>and the editor windows you used to edit files in the epub</b>.</p><p>Rebuild the ePub, updating your calibre library.</p></string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/calibre/utils/zipfile.py b/src/calibre/utils/zipfile.py index 8f22b5f9e2..dbcc125274 100644 --- a/src/calibre/utils/zipfile.py +++ b/src/calibre/utils/zipfile.py @@ -1147,28 +1147,27 @@ class ZipFile: self._writecheck(zinfo) self._didModify = True - fp = open(filename, "rb") - # Must overwrite CRC and sizes with correct data later - zinfo.CRC = CRC = 0 - zinfo.compress_size = compress_size = 0 - zinfo.file_size = file_size = 0 - self.fp.write(zinfo.FileHeader()) - if zinfo.compress_type == ZIP_DEFLATED: - cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, - zlib.DEFLATED, -15) - else: - cmpr = None - while 1: - buf = fp.read(1024 * 8) - if not buf: - break - file_size = file_size + len(buf) - CRC = crc32(buf, CRC) & 0xffffffff - if cmpr: - buf = cmpr.compress(buf) - compress_size = compress_size + len(buf) - self.fp.write(buf) - fp.close() + with open(filename, "rb") as fp: + # Must overwrite CRC and sizes with correct data later + zinfo.CRC = CRC = 0 + zinfo.compress_size = compress_size = 0 + zinfo.file_size = file_size = 0 + self.fp.write(zinfo.FileHeader()) + if zinfo.compress_type == ZIP_DEFLATED: + cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION, + zlib.DEFLATED, -15) + else: + cmpr = None + while 1: + buf = fp.read(1024 * 8) + if not buf: + break + file_size = file_size + len(buf) + CRC = crc32(buf, CRC) & 0xffffffff + if cmpr: + buf = cmpr.compress(buf) + compress_size = compress_size + len(buf) + self.fp.write(buf) if cmpr: buf = cmpr.flush() compress_size = compress_size + len(buf) From cfee94ad0b28f5b6d2267fd5d14e3f75d1ef6a01 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 13:04:14 -0600 Subject: [PATCH 190/235] Sixth beta --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 6cab1d32e7..7cb4d78cf8 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.7.904' +__version__ = '0.7.905' __author__ = "Kovid Goyal <kovid@kovidgoyal.net>" import re From 1d87806ff9cd4b0c05c494a184bfc5b0e97a3224 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 13:24:01 -0600 Subject: [PATCH 191/235] ... --- src/calibre/gui2/layout.py | 2 +- src/calibre/translations/calibre.pot | 6123 +++++++++++++------------- 2 files changed, 3065 insertions(+), 3060 deletions(-) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index ec7e023dc1..0d2f9bfd92 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -152,7 +152,7 @@ class SearchBar(QWidget): # {{{ l.addWidget(x) x.setToolTip(_("Advanced search")) - self.label = x = QLabel('&Search:') + self.label = x = QLabel(_('&Search:')) l.addWidget(self.label) x.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 146a2e2e0c..8e87b1c47d 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.7.20\n" -"POT-Creation-Date: 2010-09-24 14:39+MDT\n" -"PO-Revision-Date: 2010-09-24 14:39+MDT\n" +"POT-Creation-Date: 2010-09-29 13:23+MDT\n" +"PO-Revision-Date: 2010-09-29 13:23+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -15,540 +15,540 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43 msgid "Does absolutely nothing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46 -#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74 -#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:76 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/books.py:46 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:412 -#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70 -#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71 -#: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267 -#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:526 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:405 -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97 -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100 -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56 -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:407 -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:70 -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:72 -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:336 -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:339 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:240 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:283 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:286 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:20 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:21 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:333 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:945 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1057 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:49 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:39 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:65 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:78 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:119 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:153 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:611 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:817 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:819 -#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49 -#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:139 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:64 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:112 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:118 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:173 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:39 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/palmdoc/writer.py:29 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ztxt/writer.py:27 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:82 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:83 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:73 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:74 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:63 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:64 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:65 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:66 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:63 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:64 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:62 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98 -#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:239 -#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:241 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:352 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:359 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:296 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:299 -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:137 -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:144 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:111 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:138 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:869 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1162 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1165 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:173 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:357 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:877 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1062 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:96 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:187 -#: /home/kovid/work/calibre/src/calibre/library/cli.py:213 -#: /home/kovid/work/calibre/src/calibre/library/database.py:913 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:375 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:387 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1064 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1139 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1843 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1845 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1972 -#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:211 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:137 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:140 -#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:71 -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:117 -#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:46 -#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:64 -#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:78 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:50 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46 +#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:74 +#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:76 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/books.py:46 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:412 +#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70 +#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71 +#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267 +#: /home/kovid/work/trunk/src/calibre/devices/prs505/sony_cache.py:526 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:405 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:97 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:100 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:407 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:70 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:72 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:336 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:339 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:240 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:283 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:286 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:402 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/book/base.py:20 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/book/base.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:333 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:66 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:123 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:125 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:945 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1057 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:39 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:65 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:78 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:119 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:153 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:611 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:817 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:819 +#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49 +#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:911 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:916 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:982 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:112 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:118 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98 +#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:239 +#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:241 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:352 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:359 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:296 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:299 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:144 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:869 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:878 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1162 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1165 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:155 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:571 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:357 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:377 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:877 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1062 +#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:187 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:213 +#: /home/kovid/work/trunk/src/calibre/library/database.py:913 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:375 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:387 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1070 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1145 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1849 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1851 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1978 +#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:214 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:137 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:140 +#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:72 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:117 +#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:46 +#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:64 +#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:78 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50 msgid "Unknown" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:64 msgid "Base" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172 msgid "File type" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:208 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:208 msgid "Metadata reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:238 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:238 msgid "Metadata writer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:268 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:268 msgid "Catalog generator" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:369 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:369 msgid "User Interface Action" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:386 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:22 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:187 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:251 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:273 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206 +#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:386 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:187 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:251 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:273 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206 msgid "Preferences" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:17 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:17 msgid "Follow all local links in an HTML file and create a ZIP file containing all linked files. This plugin is run every time you add an HTML file to the library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:53 msgid "Character encoding for the input HTML files. Common choices include: cp1252, latin1, iso-8859-1 and utf-8." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:60 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:60 msgid "Create a PMLZ archive containing the PML file and all images in the directory pmlname_img or images. This plugin is run every time you add a PML file to the library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:94 msgid "Extract cover from comic files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:121 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:132 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:144 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:154 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:164 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:205 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:215 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:225 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:236 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:247 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:259 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:280 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:291 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:301 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:311 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:121 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:132 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:144 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:154 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:164 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:175 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:185 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:195 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:205 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:215 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:225 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:236 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:247 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:259 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:280 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:291 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:301 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:311 msgid "Read metadata from %s files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:270 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:270 msgid "Read metadata from ebooks in RAR archives" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:322 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:322 msgid "Read metadata from ebooks in ZIP archives" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:335 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:345 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:355 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:377 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:388 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:398 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:335 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:345 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:355 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:377 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:388 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:398 msgid "Set metadata in %s files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:366 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:366 msgid "Set metadata from %s files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:688 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:688 msgid "Look and Feel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:690 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:702 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:713 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:724 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:690 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:702 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:713 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:724 msgid "Interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:694 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:694 msgid "Adjust the look and feel of the calibre interface to suit your tastes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:700 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:700 msgid "Behavior" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:706 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:706 msgid "Change the way calibre behaves" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:711 -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:176 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:711 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:176 msgid "Add your own columns" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:717 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:717 msgid "Add/remove your own columns to the calibre book list" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:722 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:722 msgid "Customize the toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:728 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:728 msgid "Customize the toolbars and context menus, changing which actions are available in each" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:734 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:734 msgid "Input Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:736 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:747 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:758 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:736 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:747 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:758 msgid "Conversion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:740 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:740 msgid "Set conversion options specific to each input format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:745 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:745 msgid "Common Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:751 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:751 msgid "Set conversion options common to all formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:756 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:756 msgid "Output Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:762 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:762 msgid "Set conversion options specific to each output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:767 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:767 msgid "Adding books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:769 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:781 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:793 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:769 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:781 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:793 msgid "Import/Export" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:773 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:773 msgid "Control how calibre reads metadata from files when adding books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:779 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:779 msgid "Saving books to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:785 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:785 msgid "Control how calibre exports files from its database to disk when using Save to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:791 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:791 msgid "Sending books to devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:797 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:797 msgid "Control how calibre transfers files to your ebook reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:803 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:803 msgid "Sharing books by email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:805 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:817 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:805 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:817 msgid "Sharing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:809 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:809 msgid "Setup sharing of books via email. Can be used for automatic sending of downloaded news to your devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:815 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:815 msgid "Sharing over the net" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:821 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:821 msgid "Setup the calibre Content Server which will give you access to your calibre library from anywhere, on any device, over the internet" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:828 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:828 msgid "Plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:830 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:842 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:853 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:830 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:842 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:853 msgid "Advanced" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:834 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:834 msgid "Add/remove/customize various bits of calibre functionality" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:840 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:840 msgid "Tweaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:846 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:846 msgid "Fine tune how calibre behaves in various contexts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:851 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:851 msgid "Miscellaneous" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:857 +#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:857 msgid "Miscellaneous advanced configuration" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102 +#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102 msgid "Conversion Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:129 +#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:129 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:241 +#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241 msgid "Conversion Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:255 +#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255 msgid "If specified, the output plugin will try to create output that is as human readable as possible. May not have any effect for some output plugins." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:45 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:46 msgid "Input profile" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:49 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:50 msgid "This profile tries to provide sane defaults and is useful if you know nothing about the input document." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:57 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:418 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:58 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:422 msgid "This profile is intended for the SONY PRS line. The 500/505/600/700 etc." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:70 msgid "This profile is intended for the SONY PRS 300." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:78 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:453 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:79 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:459 msgid "This profile is intended for the SONY PRS-900." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:86 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:483 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:87 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:489 msgid "This profile is intended for the Microsoft Reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:97 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:494 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:98 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:500 msgid "This profile is intended for the Mobipocket books." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:110 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:507 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:111 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:513 msgid "This profile is intended for the Hanlin V3 and its clones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:122 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:519 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:123 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:525 msgid "This profile is intended for the Hanlin V5 and its clones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:132 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:527 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:133 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:533 msgid "This profile is intended for the Cybook G3." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:145 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:540 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:146 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:546 msgid "This profile is intended for the Cybook Opus." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:157 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:551 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:158 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:557 msgid "This profile is intended for the Amazon Kindle." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:169 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:589 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:170 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:595 msgid "This profile is intended for the Irex Illiad." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:181 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:602 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:182 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:608 msgid "This profile is intended for the IRex Digital Reader 1000." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:194 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:616 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:195 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:622 msgid "This profile is intended for the IRex Digital Reader 800." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206 -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:630 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:207 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:636 msgid "This profile is intended for the B&N Nook." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:228 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:229 msgid "Output profile" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:232 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:233 msgid "This profile tries to provide sane defaults and is useful if you want to produce a document intended to be read at a computer or on a range of devices." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:262 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:266 msgid "Intended for the iPad and similar devices with a resolution of 768x1024" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:431 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:437 msgid "This profile is intended for the Kobo Reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:444 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:450 msgid "This profile is intended for the SONY PRS-300." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:462 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:468 msgid "This profile is intended for the 5-inch JetBook." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:471 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:477 msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc, in landscape mode. Mainly useful for comics." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:571 +#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:577 msgid "This profile is intended for the Amazon Kindle DX." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34 msgid "Installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:35 msgid "Mapping for filetype plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:36 msgid "Local plugin customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:37 msgid "Disabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:38 msgid "Enabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:93 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:93 msgid "No valid plugin found in " msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:508 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:508 msgid "Initialization of plugin %s failed with traceback:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:541 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:541 msgid "" " %prog options\n" "\n" @@ -556,636 +556,636 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:547 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:547 msgid "Add a plugin by specifying the path to the zip file containing it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:549 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:549 msgid "Remove a custom plugin by name. Has no effect on builtin plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:551 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:551 msgid "Customize plugin. Specify name of plugin and customization string separated by a comma." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:553 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:553 msgid "List all installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:555 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:555 msgid "Enable the named plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:557 +#: /home/kovid/work/trunk/src/calibre/customize/ui.py:557 msgid "Disable the named plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13 +#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13 msgid "Communicate with Android phones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:52 +#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:52 msgid "Comma separated list of directories to send e-books to on the device. The first one that exists will be used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:94 +#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:94 msgid "Communicate with S60 phones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:85 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:85 msgid "Apple device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:87 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:87 msgid "Communicate with iTunes/iBooks." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:93 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:93 msgid "Apple device detected, launching iTunes, please wait ..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:246 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:249 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:246 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:249 msgid "Updating device metadata listing..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:323 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:362 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:922 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:962 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2831 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2871 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:323 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:362 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:922 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:962 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2831 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2871 msgid "%d of %d" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:967 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2877 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:369 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:967 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2877 msgid "finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:544 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:544 msgid "Use Series as Category in iTunes/iBooks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:546 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:546 msgid "Cache covers from iTunes/iBooks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:558 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:558 msgid "" "Some books not found in iTunes database.\n" "Delete using the iBooks app.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:886 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:886 msgid "" "Some cover art could not be converted.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2499 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:823 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:851 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:244 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:198 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:211 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1712 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:134 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2499 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:817 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:823 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:851 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:244 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:198 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:211 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1718 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:134 msgid "News" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2500 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20 -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:556 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1675 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1693 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2500 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:556 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1681 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:1699 msgid "Catalog" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2738 +#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2738 msgid "Communicate with iTunes." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17 msgid "Communicate with the Binatone Readme eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13 +#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13 msgid "Communicate with the Blackberry smart phone." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14 -#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18 -#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:90 +#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14 +#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18 +#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90 msgid "Kovid Goyal" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22 +#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24 +#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24 msgid "Communicate with the EB600 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193 +#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:193 msgid "Communicate with the Astak Mentor EB600" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216 +#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:216 msgid "Communicate with the PocketBook 301 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17 msgid "Entourage Edge" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18 +#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18 msgid "Communicate with the Entourage Edge." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16 +#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16 msgid "Communicate with the ESlick eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49 +#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:49 msgid "Communicate with the Sigmatek eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16 -#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30 +#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:16 +#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:30 msgid "Use an arbitrary folder as a device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26 -#: /home/kovid/work/calibre/src/calibre/devices/interface.py:14 +#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:26 +#: /home/kovid/work/trunk/src/calibre/devices/interface.py:14 msgid "Device Interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19 +#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19 msgid "Communicate with Hanlin V3 eBook readers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:96 +#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:96 msgid "Communicate with Hanlin V5 eBook readers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:115 +#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:115 msgid "Communicate with the BOOX eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:132 +#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:132 msgid "Comma separated list of directories to send e-books to on the device. The first one that exists will be used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:22 +#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:22 msgid "Communicate with the Hanvon N520 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:47 +#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:47 msgid "Communicate with The Book reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:59 +#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:59 msgid "Communicate with the SpringDesign Alex eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:78 +#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:78 msgid "Communicate with the Azbooka" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:94 +#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:94 msgid "Communicate with the Elonex EB 511 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16 +#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16 msgid "Communicate with the IRex Iliad eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17 -#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:42 +#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:42 msgid "John Schember" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16 +#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:16 msgid "Communicate with the IRex Digital Reader 1000 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42 +#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42 msgid "Communicate with the IRex Digital Reader 800" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15 +#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15 msgid "Communicate with the Iriver Story reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20 +#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20 msgid "Communicate with the JetBook eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:88 +#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:88 msgid "Communicate with the MiBuk Wolder reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:43 +#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:43 msgid "Communicate with the Kindle eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:170 +#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:170 msgid "Communicate with the Kindle 2/3 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:211 +#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:211 msgid "Communicate with the Kindle DX eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:23 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:23 msgid "Communicate with the Kobo Reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:47 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:47 msgid "The Kobo supports only one collection currently: the \"Im_Reading\" list. Create a tag called \"Im_Reading\" " msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:63 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:66 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:69 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:188 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:68 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:74 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:136 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:143 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:166 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:63 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:66 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:69 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:188 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:68 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:71 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:74 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:136 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:143 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:166 msgid "Getting list of books on device..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:248 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:280 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:253 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:248 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:280 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:253 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:271 msgid "Removing books from device..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:284 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:291 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:278 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:283 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:284 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:291 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:278 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:283 msgid "Removing books from device metadata listing..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:296 -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:330 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:217 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:247 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:296 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:330 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:217 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:247 msgid "Adding books to device metadata listing..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:392 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:252 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:392 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:252 msgid "Not Implemented" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:393 +#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:393 msgid "\".kobo\" files do not exist on the device as books instead, they are rows in the sqlite database. Currently they cannot be exported or viewed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:17 msgid "Communicate with the Palm Pre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:37 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:37 msgid "Communicate with the Booq Avant" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:58 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:58 msgid "Communicate with the Sweex MM300" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:79 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:79 msgid "Communicate with the Kogan" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:87 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:87 msgid "Communicate with the Pandigital Novel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/misc.py:114 +#: /home/kovid/work/trunk/src/calibre/devices/misc.py:114 msgid "Communicate with the GM2000" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17 msgid "Communicate with the Nokia 770 internet tablet." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40 +#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40 msgid "Communicate with the Nokia 810 internet tablet." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74 +#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:74 msgid "Communicate with the Nokia E52" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20 +#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20 msgid "The Nook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21 +#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21 msgid "Communicate with the Nook eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17 msgid "Communicate with the Nuut2 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89 +#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89 msgid "Communicate with the Sony PRS-500 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22 +#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:22 msgid "Communicate with all the Sony eBook readers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61 +#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:61 msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:149 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68 +#: /home/kovid/work/trunk/src/calibre/devices/prs505/sony_cache.py:149 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68 msgid "Unnamed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17 +#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17 msgid "Communicate with the Samsung SNE eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11 +#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11 msgid "Communicate with the Teclast K3/K5 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:36 +#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:36 msgid "Communicate with the Newsmy reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:48 +#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:48 msgid "Communicate with the iPapyrus reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:59 +#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:59 msgid "Communicate with the Sovos reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:255 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:255 msgid "Unable to detect the %s disk drive. Try rebooting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:435 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:435 msgid "Unable to detect the %s mount point. Try rebooting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:500 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:500 msgid "Unable to detect the %s disk drive." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:593 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:593 msgid "Could not find mount helper: %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:605 msgid "Unable to detect the %s disk drive. Your kernel is probably exporting a deprecated version of SYSFS." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:613 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:613 msgid "Unable to mount main memory (Error code: %d)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:750 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:752 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:750 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:752 msgid "The reader has no storage card in this slot." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:754 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:754 msgid "Selected slot: %s is not supported." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:783 msgid "There is insufficient free space in main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:785 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:787 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:785 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:787 msgid "There is insufficient free space on the storage card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12 msgid "Configure Device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:37 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:37 msgid "settings for device drivers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39 msgid "Ordered list of formats the device will accept" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:41 msgid "Place files in sub directories if the device supports them" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:43 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:86 msgid "Read metadata from files on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:45 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:45 msgid "Use author sort instead of author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:47 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:47 msgid "Template to control how books are saved" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:50 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:89 msgid "Extra customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:41 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:41 msgid "Communicate with an eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:57 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:57 msgid "Get device information..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:194 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:194 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:196 msgid "Transferring books to device..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:314 +#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:314 msgid "Sending metadata to device..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41 msgid "%prog [options] mybook.chm" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42 msgid "Output directory. Defaults to current directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:45 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589 msgid "Set the book title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:47 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:47 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591 msgid "Set sort key for the title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:49 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593 msgid "Set the author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:51 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:51 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595 msgid "Set sort key for the author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:53 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597 msgid "The category this book belongs to. E.g.: History" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:56 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600 msgid "Path to a graphic that will be set as this files' thumbnail" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:59 msgid "Path to a txt file containing a comment." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:62 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607 msgid "Extract thumbnail from LRF file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:63 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608 msgid "Set the publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:64 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609 msgid "Set the book classification" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:65 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:65 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610 msgid "Set the book creator" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:66 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:66 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611 msgid "Set the book producer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:68 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:68 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613 msgid "Extract cover from LRF file. Note that the LRF format has no defined cover, so we use some heuristics to guess the cover." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:70 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615 msgid "Set book ID" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72 +#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72 msgid "Set font delta" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:182 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:182 msgid "Rendered %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:185 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:185 msgid "Failed %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:239 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:239 msgid "" "Failed to process comic: \n" "\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:258 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:258 msgid "Number of colors for grayscale image conversion. Default: %default. Values of less than 256 may result in blurred text on your device if you are creating your comics in EPUB format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:262 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:262 msgid "Disable normalize (improve contrast) color range for pictures. Default: False" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:265 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:265 msgid "Maintain picture aspect ratio. Default is to fill the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:267 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:267 msgid "Disable sharpening." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:269 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:269 msgid "Disable trimming of comic pages. For some comics, trimming might remove content as well as borders." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:272 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:272 msgid "Don't split landscape images into two portrait images" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:274 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:274 msgid "Keep aspect ratio and scale image using screen height as image width for viewing in landscape mode." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:277 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:277 msgid "Used for right-to-left publications like manga. Causes landscape pages to be split into portrait pages from right to left." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:281 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:281 msgid "Enable Despeckle. Reduces speckle noise. May greatly increase processing time." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:284 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:284 msgid "Don't sort the files found in the comic alphabetically by name. Instead use the order they were added to the comic." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:288 msgid "The format that images in the created ebook are converted to. You can experiment to see which format gives you optimal size and look on your device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:292 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:292 msgid "Apply no processing to the image" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:294 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:294 msgid "Do not convert the image to grayscale (black and white)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:431 -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:442 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:431 +#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:442 msgid "Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19 msgid "" "input_file output_file [options]\n" "\n" @@ -1200,333 +1200,333 @@ msgid "" "For full documentation of the conversion system see\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97 msgid "INPUT OPTIONS" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98 msgid "Options to control the processing of the input %s file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104 msgid "OUTPUT OPTIONS" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105 msgid "Options to control the processing of the output %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:119 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119 msgid "Options to control the look and feel of the output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:135 msgid "Control auto-detection of document structure." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:145 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145 msgid "Control the automatic generation of a Table of Contents. By default, if the source file has a Table of Contents, it will be used in preference to the automatically generated one." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:155 msgid "Options to set metadata in the output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158 msgid "Options to help with debugging the conversion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183 msgid "List builtin recipes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256 msgid "Output saved to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95 msgid "Level of verbosity. Specify multiple times for greater verbosity." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:102 msgid "Save the output from different stages of the conversion pipeline to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:111 msgid "Specify the input profile. The input profile gives the conversion system information on how to interpret various information in the input document. For example resolution dependent lengths (i.e. lengths in pixels). Choices are:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122 msgid "Specify the output profile. The output profile tells the conversion system how to optimize the created document for the specified device. In some cases, an output profile is required to produce documents that will work on a device. For example EPUB on the SONY reader. Choices are:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133 msgid "The base font size in pts. All font sizes in the produced book will be rescaled based on this size. By choosing a larger size you can make the fonts in the output bigger and vice versa. By default, the base font size is chosen based on the output profile you chose." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143 msgid "Mapping from CSS font names to font sizes in pts. An example setting is 12,12,14,16,18,20,22,24. These are the mappings for the sizes xx-small to xx-large, with the final size being for huge fonts. The font rescaling algorithm uses these sizes to intelligently rescale fonts. The default is to use a mapping based on the output profile you chose." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155 msgid "Disable all rescaling of font sizes." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162 msgid "The line height in pts. Controls spacing between consecutive lines of text. By default no line height manipulation is performed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170 msgid "Some badly designed documents use tables to control the layout of text on the page. When converted these documents often have text that runs off the page and other artifacts. This option will extract the content from the tables and present it in a linear fashion." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level one. If this is specified, it takes precedence over other forms of auto-detection." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level two. Each entry is added under the previous level one entry." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level three. Each entry is added under the previous level two entry." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205 msgid "Normally, if the source file already has a Table of Contents, it is used in preference to the auto-generated one. With this option, the auto-generated one is always used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:213 msgid "Don't add auto-detected chapters to the Table of Contents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:220 msgid "If fewer than this number of chapters is detected, then links are added to the Table of Contents. Default: %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227 msgid "Maximum number of links to insert into the TOC. Set to 0 to disable. Default is: %default. Links are only added to the TOC if less than the threshold number of chapters were detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235 msgid "Remove entries from the Table of Contents whose titles match the specified regular expression. Matching entries and all their children are removed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:246 msgid "An XPath expression to detect chapter titles. The default is to consider <h1> or <h2> tags that contain the words \"chapter\",\"book\",\"section\" or \"part\" as chapter titles as well as any tags that have class=\"chapter\". The expression used must evaluate to a list of elements. To disable chapter detection, use the expression \"/\". See the XPath Tutorial in the calibre User Manual for further help on using this feature." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260 msgid "Specify how to mark detected chapters. A value of \"pagebreak\" will insert page breaks before chapters. A value of \"rule\" will insert a line before chapters. A value of \"none\" will disable chapter marking and a value of \"both\" will use both page breaks and lines to mark chapters." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270 msgid "Either the path to a CSS stylesheet or raw CSS. This CSS will be appended to the style rules from the source file, so it can be used to override those rules." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:279 msgid "An XPath expression. Page breaks are inserted before the specified elements." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285 msgid "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290 msgid "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295 msgid "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300 msgid "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306 msgid "Change text justification. A value of \"left\" converts all justified text in the source to left aligned (i.e. unjustified) text. A value of \"justify\" converts all unjustified text to justified. A value of \"original\" (the default) does not change justification in the source file. Note that only some output formats support justification." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316 msgid "Remove spacing between paragraphs. Also sets an indent on paragraphs of 1.5em. Spacing removal will not work if the source file does not use paragraphs (<p> or <div> tags)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:323 msgid "When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:330 msgid "Use the cover detected from the source file in preference to the specified cover." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:336 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:336 msgid "Insert a blank line between paragraphs. Will not work if the source file does not use paragraphs (<p> or <div> tags)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343 msgid "Remove the first image from the input ebook. Useful if the first image in the source file is a cover and you are specifying an external cover." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:351 msgid "Insert the book metadata at the start of the book. This is useful if your ebook reader does not support displaying/searching metadata directly." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:359 msgid "Attempt to detect and correct hard line breaks and other problems in the source file. This may make things worse, so use with care." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:367 msgid "Scale used to determine the length at which a line should be unwrapped if preprocess is enabled. Valid values are a decimal between 0 and 1. The default is 0.40, just below the median line length. This will unwrap typical books with hard line breaks, but should be reduced if the line length is variable." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:376 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:376 msgid "Convert plain quotes, dashes and ellipsis to their typographically correct equivalents. For details, see http://daringfireball.net/projects/smartypants" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:384 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:384 msgid "Use a regular expression to try and remove the header." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:391 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:391 msgid "The regular expression to use to remove the header." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:397 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:397 msgid "Use a regular expression to try and remove the footer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:404 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:404 msgid "The regular expression to use to remove the footer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:411 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:411 msgid "Read metadata from the specified OPF file. Metadata read from this file will override any metadata in the source file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:418 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:418 msgid "Transliterate unicode characters to an ASCII representation. Use with care because this will replace unicode characters with ASCII. For instance it will replace \"%s\" with \"Mikhail Gorbachiov\". Also, note that in cases where there are multiple representations of a character (characters shared by Chinese and Japanese for instance) the representation used by the largest number of people will be used (Chinese in the previous example)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:433 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:433 msgid "Preserve ligatures present in the input document. A ligature is a special rendering of a pair of characters like ff, fi, fl et cetera. Most readers do not have support for ligatures in their default fonts, so they are unlikely to render correctly. By default, calibre will turn a ligature into the corresponding pair of normal characters. This option will preserve them instead." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38 msgid "Set the title." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449 msgid "Set the authors. Multiple authors should be separated by ampersands." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:454 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:454 msgid "The version of the title to be used for sorting. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:458 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:458 msgid "String to be used when sorting by author. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:462 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:462 msgid "Set the cover to the specified file or URL" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:466 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:466 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54 msgid "Set the ebook description." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:470 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:470 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56 msgid "Set the ebook publisher." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:474 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:474 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60 msgid "Set the series this ebook belongs to." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:478 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:478 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62 msgid "Set the index of the book in this series." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:482 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:482 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64 msgid "Set the rating. Should be a number between 1 and 5." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:486 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:486 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66 msgid "Set the ISBN of the book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:490 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:490 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68 msgid "Set the tags for the book. Should be a comma separated list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:494 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:494 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70 msgid "Set the book producer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:498 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:498 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72 msgid "Set the language." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:502 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:502 msgid "Set the publication date." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:506 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:506 msgid "Set the book timestamp (used by the date column in calibre)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:606 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:606 msgid "Could not find an ebook inside the archive" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:664 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:664 msgid "Values of series index and rating must be numbers. Ignoring" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:671 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:671 msgid "Failed to parse date/time" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:826 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:826 msgid "Converting input to HTML..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:853 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:853 msgid "Running transforms on ebook..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:940 +#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:940 msgid "Creating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:20 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/__init__.py:20 msgid "Failed to parse: %s with error: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:26 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/__init__.py:26 msgid "ePub Fixer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/epubcheck.py:18 msgid "Workaround epubcheck bugs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/epubcheck.py:22 msgid "Workarounds for bugs in the latest release of epubcheck. epubcheck reports many things as errors that are not actually errors. epub-fix will try to detect these and replace them with constructs that epubcheck likes. This may cause significant changes to your epub, complain to the epubcheck project." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/main.py:21 msgid "" "%prog [options] file.epub\n" "\n" @@ -1535,227 +1535,227 @@ msgid "" "By default, no fixing is done and messages are printed out for each error detected. Use the options to control which errors are automatically fixed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:52 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/main.py:52 msgid "You must specify an epub file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:17 msgid "Fix unmanifested files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:21 msgid "Fix unmanifested files. epub-fix can either add them to the manifest or delete them as specified by the delete unmanifested option." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:32 msgid "Delete unmanifested files instead of adding them to the manifest" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56 msgid "Extract the contents of the generated EPUB file to the specified directory. The contents of the directory are first deleted, so be careful." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:62 msgid "Turn off splitting at page breaks. Normally, input files are automatically split at every page break into two files. This gives an output ebook that can be parsed faster and with less resources. However, splitting is slow and if your source file contains a very large number of page breaks, you should turn off splitting on page breaks." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73 msgid "Split all HTML files larger than this size (in KB). This is necessary as most EPUB readers cannot handle large file sizes. The default of %defaultKB is the size required for Adobe Digital Editions." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80 msgid "Normally, if the input file has no cover and you don't specify one, a default cover is generated with the title, authors, etc. This option disables the generation of this cover." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:86 msgid "Do not use SVG for the book cover. Use this option if your EPUB is going to be used on a device that does not support SVG, like the iPhone or the JetBook Lite. Without this option, such devices will display the cover as a blank page." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94 msgid "When using an SVG cover, this option will cause the cover to scale to cover the available screen area, but still preserve its aspect ratio (ratio of width to height). That means there may be white borders at the sides or top and bottom of the image, but the image will never be distorted. Without this option the image may be slightly distorted, but there will be no borders." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169 +#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169 msgid "Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:147 -#: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102 -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:147 +#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77 msgid "Table of Contents:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:32 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:32 msgid "Do not insert a Table of Contents at the beginning of the book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32 -#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:37 -#: /home/kovid/work/calibre/src/calibre/ebooks/rb/output.py:21 -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:35 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32 +#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37 +#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35 msgid "Add Table of Contents to beginning of the book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:24 msgid "Try to turn chapters into individual sections. WARNING: This option is experimental. It can cause conversion to fail. It can also produce unexpected output." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:249 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:249 msgid "Traverse links in HTML files breadth first. Normally, they are traversed depth first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:256 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:256 msgid "Maximum levels of recursion when following links in HTML files. Must be non-negative. 0 implies that no links in the root HTML file are followed. Default is %default." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:265 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:265 msgid "Normally this input plugin re-arranges all the input files into a standard folder hierarchy. Only use this option if you know what you are doing as it can result in various nasty side effects in the rest of of the conversion pipeline." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:273 +#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:273 msgid "Average line length for line breaking if the HTML is from a previous partial conversion of a PDF file. Default is %default which disables this." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47 +#: /home/kovid/work/trunk/src/calibre/ebooks/lit/from_any.py:47 msgid "Creating LIT file from EPUB..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320 msgid "\tBook Designer file detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322 msgid "\tParsing HTML..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345 msgid "\tBaen file detected. Re-parsing..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361 msgid "Written preprocessed HTML to " msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379 msgid "Processing %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393 msgid "\tConverting to BBeB..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539 -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552 msgid "Could not parse file: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544 msgid "%s is an empty file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564 msgid "Failed to parse link %s %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608 msgid "Cannot add link %s to TOC" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957 msgid "Unable to process image %s. Error: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002 msgid "Unable to process interlaced PNG %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017 msgid "" "Could not process image: %s\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772 msgid "An error occurred while processing a table: %s. Ignoring table markup." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774 msgid "" "Bad table:\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796 msgid "Table has cell that is too large" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862 msgid "Could not read cover image: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865 msgid "Cannot read from: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994 msgid "Failed to process opf file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136 msgid "" "%prog book.lrf\n" "Convert an LRF file into an LRS (XML UTF-8 encoded) file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137 msgid "Output LRS file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139 msgid "Do not save embedded image and font files to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:158 msgid "Parsing LRF..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161 msgid "Creating XML..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163 msgid "LRS written to " msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267 msgid "Could not read from thumbnail file:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287 msgid "" "%prog [options] file.lrs\n" "Compile an LRS file into an LRF file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288 msgid "Path to output file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:114 msgid "Verbose processing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292 msgid "Convert LRS to LRS, useful for debugging." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457 msgid "Invalid LRF file. Could not set metadata." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582 msgid "" "%prog [options] mybook.lrf\n" "\n" @@ -1764,157 +1764,157 @@ msgid "" "\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:603 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603 msgid "Path to a txt file containing the comment to be stored in the lrf file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90 msgid "Enable autorotation of images that are wider than the screen width." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:94 msgid "Set the space between words in pts. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97 msgid "Add a header to all the pages with title and author." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:100 msgid "Set the format of the header. %a is replaced by the author and %t by the title. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104 msgid "Add extra spacing below the header. Default is %default pt." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:107 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107 msgid "Minimum paragraph indent (the indent of the first line of a paragraph) in pts. Default: %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:112 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112 msgid "Render tables in the HTML as images (useful if the document has large or complex tables)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117 msgid "Multiply the size of text in rendered tables by this factor. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121 msgid "The serif family of fonts to embed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124 msgid "The sans-serif family of fonts to embed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127 msgid "The monospace family of fonts to embed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152 +#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152 msgid "Comic" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:401 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:354 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:882 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:589 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:401 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:354 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:882 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:589 msgid "Title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:402 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:359 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:883 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:402 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:359 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:883 msgid "Author(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:403 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:403 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:72 msgid "Publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:404 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:404 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49 msgid "Producer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:405 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:35 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:210 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:211 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:189 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:72 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:313 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1081 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:405 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:211 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:189 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:313 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1081 msgid "Comments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:413 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:154 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:301 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1077 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:145 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:413 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:154 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:301 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1077 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:145 msgid "Tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:415 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:152 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:318 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1086 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:93 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:415 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:152 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:318 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1086 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:93 msgid "Series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:416 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:416 msgid "Language" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:418 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1069 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:418 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1069 msgid "Timestamp" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:420 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:151 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:420 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:151 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:70 msgid "Published" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:422 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:422 msgid "Rights" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85 msgid "EDITORIAL REVIEW" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:41 msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:20 msgid "options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21 msgid "" "\n" "Read/Write metadata from/to ebook files.\n" @@ -1928,147 +1928,155 @@ msgid "" "silently ignored.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40 msgid "Set the authors. Multiple authors should be separated by the & character. Author names should be in the order Firstname Lastname." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:44 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:44 msgid "The version of the title to be used for sorting. If unspecified, and the title is specified, it will be auto-generated from the title." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:48 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:48 msgid "String to be used when sorting by author. If unspecified, and the author(s) are specified, it will be auto-generated from the author(s)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:52 msgid "Set the cover to the specified file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58 msgid "Set the book category." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74 msgid "Set the published date." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77 msgid "Get the cover from the ebook and save it at as the specified file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:80 msgid "Specify the name of an OPF file. The metadata will be written to the OPF file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83 msgid "Read metadata from the specified OPF file and use it to set metadata in the ebook. Metadata specified on the command line will override metadata read from the OPF file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:88 msgid "Set the BookID in LRF files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153 msgid "No file specified" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168 msgid "Original metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185 msgid "Changed metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197 msgid "OPF created in" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203 msgid "Cover saved to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205 msgid "No cover found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:27 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:28 msgid "Cover download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:79 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:80 msgid "Download covers from openlibrary.org" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:107 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:136 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:108 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:137 msgid "ISBN: %s not found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:117 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:118 msgid "Download covers from librarything.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:128 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:68 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:129 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:68 msgid "LibraryThing.com timed out. Try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:135 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:75 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:136 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:75 msgid "Could not fetch cover as server is experiencing high load. Please try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:139 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:79 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:140 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:79 msgid "LibraryThing.com server error. Try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:226 +msgid "Download covers from Douban.com" +msgstr "" + +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:235 +msgid "Douban.com API timed out. Try again later." +msgstr "" + +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/douban.py:42 msgid "Downloads metadata from Douban.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:51 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:51 msgid "Metadata download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:128 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:128 msgid "ratings" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:128 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:128 msgid "tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:129 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:129 msgid "description/reviews" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:130 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:130 msgid "Download %s from %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:156 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:156 msgid "Downloads metadata from Google Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:173 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:173 msgid "Downloads metadata from isbndb.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:201 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:201 msgid "To use isbndb.com you must sign up for a %sfree account%s and enter your access key below." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:211 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:211 msgid "Downloads social metadata from amazon.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:230 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:230 msgid "Downloads series/tags/rating information from librarything.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:95 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:95 msgid "" "\n" "%prog [options] key\n" @@ -2081,27 +2089,27 @@ msgid "" "\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:106 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:106 msgid "The ISBN ID of the book you want metadata for." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:108 msgid "The author whose book to search for." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:110 msgid "The title of the book to search for." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:112 msgid "The publisher of the book to search for." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:76 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:76 msgid " not found." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:86 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:86 msgid "" "\n" "%prog [options] ISBN\n" @@ -2109,186 +2117,186 @@ msgid "" "Fetch a cover image/social metadata for the book identified by ISBN from LibraryThing.com\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1227 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399 +#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1227 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1399 msgid "Cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22 msgid "Modify images to meet Palm device size limitations." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26 msgid "When present, use author sort field as author." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30 msgid "Don't add Table of Contents to end of book. Useful if the book has its own table of contents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:33 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56 msgid "Title for any generated in-line table of contents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:37 msgid "Disable compression of the file contents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40 msgid "Tag marking book to be filed with Personal Docs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:108 msgid "All articles" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:259 +#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:259 msgid "This is an Amazon Topaz book. It cannot be processed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1400 msgid "Title Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401 -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1401 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199 msgid "Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1402 msgid "Index" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1403 msgid "Glossary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1404 msgid "Acknowledgements" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1405 msgid "Bibliography" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1406 msgid "Colophon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1407 msgid "Copyright" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1408 msgid "Dedication" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1409 msgid "Epigraph" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1410 msgid "Foreword" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1411 msgid "List of Illustrations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1412 msgid "List of Tables" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1413 msgid "Notes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1414 msgid "Preface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1415 msgid "Main Text" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41 msgid "%s format books are not supported" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/cover.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:156 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/cover.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:156 msgid "Book %s of %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54 msgid "HTML TOC generation options." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:153 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:153 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:71 msgid "Rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/split.py:34 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34 msgid "Could not find reasonable point at which to split: %s Sub-tree size: %d KB" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32 msgid "OPF/NCX/etc. generation options." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35 msgid "OPF version to generate. Default is %default." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37 +#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37 msgid "Generate an Adobe \"page-map\" file if pagination information is available." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128 msgid "Footnotes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135 msgid "Sidebar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22 -#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23 -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22 +#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:24 msgid "Normally calibre treats blank lines as paragraph markers. With this option it will assume that every line represents a paragraph instead." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26 -#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27 -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26 +#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:28 msgid "Normally calibre treats blank lines as paragraph markers. With this option it will assume that every line starting with an indent (either a tab or 2+ spaces) represents a paragraph. Paragraphs end when the next line that starts with an indent is reached." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23 msgid "Format to use inside the pdb container. Choices are:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:27 msgid "Specify the character encoding of the output document. The default is cp1252. Note: This option is not honored by all formats." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:24 msgid "Do not extract images from the document" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:26 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26 msgid "Scale used to determine the length at which a line should be unwrapped. Valid values are a decimal between 0 and 1. The default is 0.45, just below the median line length." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:30 msgid "Use the new PDF conversion engine." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31 msgid "" "command ...\n" "\n" @@ -2300,113 +2308,113 @@ msgid "" "Manipulate a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29 msgid "" "[options] file.pdf\n" "\n" "Crop a PDF file.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:38 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:32 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:34 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:36 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:34 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:33 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:41 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41 msgid "Path to output file. By default a file is created in the current directory." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:41 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41 msgid "Number of pixels to crop from the left most x (default is %s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:44 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44 msgid "Number of pixels to crop from the left most y (default is %s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47 msgid "Number of pixels to crop from the right most x (default is %s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50 msgid "Number of pixels to crop from the right most y (default is %s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53 msgid "A file generated by ghostscript which allows each page to be individually cropped `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73 msgid "Crop Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61 msgid "Options to control the transformation of pdf" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23 msgid "" "[options] file.pdf password\n" "\n" "Decrypt a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 msgid "Decrypt Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25 msgid "" "[options] file.pdf password\n" "\n" "Encrypt a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 msgid "Encrypt Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21 msgid "" "file.pdf ...\n" "\n" "Get info about a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 msgid "Author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47 msgid "Subject" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48 msgid "Creator" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50 msgid "Pages" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51 msgid "File Size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52 msgid "PDF Version" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25 msgid "" "[options] file1.pdf file2.pdf ...\n" "\n" @@ -2415,33 +2423,33 @@ msgid "" "Merges individual PDFs.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56 msgid "Merge Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25 msgid "" "[options] file.pdf\n" "\n" "Reverse a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54 msgid "Reverse Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24 msgid "" "file.pdf degrees\n" "\n" "Rotate pages of a PDF clockwise.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53 msgid "Rotate Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25 msgid "" "\n" "%prog %%name [options] file.pdf page_to_split_on ...\n" @@ -2456,1458 +2464,1458 @@ msgid "" "Split a PDF.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61 msgid "Split Options:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31 msgid "The unit of measure. Default is inch. Choices are %s Note: This does not override the unit for margins!" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36 msgid "The size of the paper. This size will be overridden when an output profile is used. Default is letter. Choices are %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40 msgid "Custom size of the document. Use the form widthxheight EG. `123x321` to specify the width and height. This overrides any specified paper-size." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45 msgid "The orientation of the page. Default is portrait. Choices are %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49 msgid "Preserve the aspect ratio of the cover, instead of stretching it to fill the ull first page of the generated pdf." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55 +#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55 msgid "Could not find pdftohtml, check it is in your PATH" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:33 +#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:33 msgid "Specify the character encoding of the output document. The default is cp1252." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:196 +#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:196 msgid "" "This RTF file has a feature calibre does not support. Convert it to HTML first and then try it.\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23 +#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:23 msgid "Specify the character encoding of the output document. The default is utf-8." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:27 +#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27 msgid "Specify the compression level to use. Scale 1 - 10. 1 being the lowest compression but the fastest and 10 being the highest compression but the slowest." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:34 msgid "Normally extra spaces are condensed into a single space. With this option all spaces will be displayed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:37 msgid "Run the text input through the markdown pre-processor. To learn more about markdown see" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:40 msgid "Do not insert a Table of Contents into the output text." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24 msgid "Type of newline to use. Options are %s. Default is 'system'. Use 'old_mac' for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. 'system' will default to the newline type used by this OS." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:30 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:30 msgid "Specify the character encoding of the output document. The default is utf-8. Note: This option is not honored by all formats." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:38 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:38 msgid "The maximum number of characters per line. This splits on the first space before the specified value. If no space is found the line will be broken at the space after and will exceed the specified value. Also, there is a minimum of 25 characters. Use 0 to disable line splitting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:45 +#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45 msgid "Force splitting on the max-line-length value when no space is present. Also allows max-line-length to be below the minimum" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:66 msgid "Send file to storage card instead of main memory by default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:68 msgid "Confirm before deleting" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:70 msgid "Main window geometry" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:72 msgid "Notify when a new version is available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:74 msgid "Use Roman numerals for series number" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:76 msgid "Sort tags list by name, popularity, or rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:78 msgid "Number of covers to show in the cover browsing mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:80 msgid "Defaults for conversion to LRF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:82 msgid "Options for the LRF ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:85 msgid "Formats that are viewed using the internal viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:87 msgid "Columns to be displayed in the book list" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:88 msgid "Automatically launch content server on application startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:89 msgid "Oldest news kept in database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:90 msgid "Show system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:92 msgid "Upload downloaded news to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:94 msgid "Delete books from library after uploading to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:96 msgid "Show the cover flow in a separate window instead of in the main calibre window" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:98 msgid "Disable notifications from the system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:100 msgid "Default action to perform when send to device button is clicked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:120 msgid "Maximum number of waiting worker processes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:122 msgid "Download social metadata (tags/rating/etc.)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:124 msgid "Overwrite author and title with new metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:126 msgid "Limit max simultaneous jobs to number of CPUs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:128 msgid "tag browser categories not to display" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:130 msgid "The layout of the user interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:132 msgid "Show the average rating per item indication in the tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:134 msgid "Disable UI animations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:479 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:479 msgid "Copied" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:216 msgid "Copy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:216 msgid "Copy to Clipboard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:462 +#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:462 msgid "Choose Files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:25 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:25 msgid "Add books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:26 msgid "Add books to the calibre library/device from files on your computer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:27 msgid "A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:33 msgid "Add books from a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:35 msgid "Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:39 msgid "Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:43 msgid "Add Empty book. (Book entry with no formats)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:45 msgid "Add from ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:84 msgid "How many empty books?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:85 msgid "How many empty books should be added?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:143 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:201 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:143 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:201 msgid "Uploading books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:160 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:170 msgid "Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:161 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:161 msgid "EPUB Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:162 msgid "LRF Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:163 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:163 msgid "HTML Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:164 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:164 msgid "LIT Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:165 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:165 msgid "MOBI Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:166 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:166 msgid "Topaz books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:167 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:167 msgid "Text books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:168 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:168 msgid "PDF Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:169 msgid "Comics" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:170 msgid "Archives" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:174 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:174 msgid "Supported books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:210 msgid "Merged some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:211 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:211 msgid "Some duplicates were found and merged into the following existing books:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:220 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:220 msgid "Failed to read metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:221 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:221 msgid "Failed to read metadata from the following" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:240 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:259 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:259 msgid "Add to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:240 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:28 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:95 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:120 msgid "No book selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:253 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:253 msgid "The following books are virtual and cannot be added to the calibre library:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:259 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:259 msgid "No book files found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add_to_library.py:13 msgid "Add books to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/add_to_library.py:14 msgid "Add books to your calibre library from the connected device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:20 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:498 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:498 msgid "Fetch annotations (experimental)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:236 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:236 msgid "Use library only" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:237 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:237 msgid "User annotations generated from main library only" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:64 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:30 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:87 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:116 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:142 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:180 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:208 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:142 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:180 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:208 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:92 msgid "No books selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:65 msgid "No books selected to fetch annotations from" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:90 msgid "Merging user annotations into database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:118 msgid "%s<br />Last Page Read: %d (%d%%)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:124 msgid "%s<br />Last Page Read: Location %d (%d%%)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:143 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:143 msgid "<b>Location %d • %s</b><br />%s<br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:152 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:152 msgid "<b>Page %d • %s</b><br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:157 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:157 msgid "<b>Location %d • %s</b><br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:20 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:34 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:34 msgid "Create catalog of books in your calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:31 msgid "No books selected to generate catalog for" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:53 msgid "Generating %s catalog..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:229 msgid "No books found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:59 msgid "" "No books to catalog\n" "Check exclude tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:69 msgid "Catalog generated." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:72 msgid "Export Catalog Directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:73 msgid "Select destination for %s.%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:51 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:51 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:111 msgid "%d books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:82 msgid "Choose calibre library to work with" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:91 msgid "Switch/create library..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:99 msgid "Quick switch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:101 msgid "Rename library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:103 msgid "Delete library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:168 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:168 msgid "Rename" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:169 msgid "Choose a new name for the library <b>%s</b>. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:170 msgid "Note that the actual library folder will be renamed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:177 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:177 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185 msgid "Already exists" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:178 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:178 msgid "The folder %s already exists. Delete it first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:184 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:184 msgid "Rename failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:185 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:185 msgid "Failed to rename the library at %s. The most common cause for this is if one of the files in the library is open in another program." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:195 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:53 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:195 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:102 msgid "Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:196 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:196 msgid "All files from %s will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:216 msgid "No library found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:217 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:217 msgid "No existing calibre library was found at %s. It will be removed from the list of known libraries." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:249 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:254 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:584 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:249 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:254 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:584 msgid "Not allowed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:250 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:250 msgid "You cannot change libraries when a device is connected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:255 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:255 msgid "You cannot change libraries while jobs are running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:22 msgid "C" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:22 msgid "Convert books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:28 msgid "Convert individually" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:30 msgid "Bulk convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:86 msgid "Cannot convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:115 msgid "Starting conversion of %d book(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:79 msgid "Copy to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:80 msgid "Copy selected books to the specified library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:115 msgid "Cannot copy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:120 msgid "No library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:121 msgid "No library found at %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:124 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:128 msgid "Copying" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:138 msgid "Could not copy books: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:670 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:428 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:670 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:428 msgid "Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:141 msgid "Copied %d books to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:18 msgid "Del" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:18 msgid "Remove books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:24 msgid "Remove selected books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:26 msgid "Remove files of a specific format from selected books.." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:29 msgid "Remove all formats from selected books, except..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:32 msgid "Remove covers from selected books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:35 msgid "Remove matching books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:53 msgid "Cannot delete" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:66 msgid "Choose formats to be deleted" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:84 msgid "Choose formats <b>not</b> to be deleted" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:104 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:104 msgid "Cannot delete books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:105 msgid "No device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:115 msgid "Main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:116 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:435 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:444 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:435 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:444 msgid "Storage Card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:117 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:437 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:446 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:437 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:446 msgid "Storage Card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:122 msgid "No books to delete" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:123 msgid "None of the selected books are on the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:140 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:195 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:195 msgid "Deleting books from device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:161 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:161 msgid "The selected books will be <b>permanently deleted</b> and the files removed from your calibre library. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:180 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:180 msgid "The selected books will be <b>permanently deleted</b> from your device. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:26 msgid "Connect to folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:31 msgid "Connect to iTunes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:40 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:48 msgid "Start Content Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:50 msgid "Stop Content Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:67 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:69 msgid "Email to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:69 msgid " and delete from library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:81 msgid "Setup email based sharing of books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:98 msgid "D" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:98 msgid "Send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:117 msgid "Connect/share" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_collections.py:13 msgid "Manage collections" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_collections.py:14 msgid "Manage the collections on this device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:24 msgid "E" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:24 msgid "Edit metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:28 msgid "Merge book records" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:29 msgid "M" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:31 msgid "Edit metadata individually" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:34 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:34 msgid "Edit metadata in bulk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:37 msgid "Download metadata and covers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:40 msgid "Download only metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:42 msgid "Download only covers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:45 msgid "Download only social metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:51 msgid "Merge into first selected book - delete others" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:54 msgid "Merge into first selected book - keep others" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:75 msgid "Cannot download metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:98 msgid "social metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:100 msgid "covers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:100 msgid "metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:105 msgid "Downloading %s for %d book(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:126 msgid "Failed to download some metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:127 msgid "Failed to download metadata for the following:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:130 msgid "Failed to download metadata:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:607 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:112 -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:607 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:112 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:54 msgid "Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:141 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:179 msgid "Cannot edit metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:207 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:207 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:210 msgid "Cannot merge books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:211 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:211 msgid "At least two books must be selected for merging" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:215 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:215 msgid "Book formats and metadata from the selected books will be added to the <b>first selected book.</b> ISBN will <i>not</i> be merged.<br><br> The second and subsequently selected books will not be deleted or changed.<br><br>Please confirm you want to proceed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:227 msgid "Book formats and metadata from the selected books will be merged into the <b>first selected book</b>. ISBN will <i>not</i> be merged.<br><br>After merger the second and subsequently selected books will be <b>deleted</b>. <br><br>All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently <b>deleted</b> from your computer.<br><br> Are you <b>sure</b> you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:240 msgid "You are about to merge more than 5 books. Are you <b>sure</b> you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:18 msgid "F" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:18 msgid "Fetch news" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:53 msgid "Fetching news from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:67 msgid " fetched." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 msgid "Browse the calibre User Manual" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 msgid "F1" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 msgid "Help" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/open.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/open.py:14 msgid "Open containing folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/open.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/open.py:15 msgid "O" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:17 msgid "Ctrl+P" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:23 msgid "Run welcome wizard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:33 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:38 msgid "Cannot configure" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:34 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:34 msgid "Cannot configure while there are running jobs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:39 msgid "Cannot configure before calibre is restarted." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/restart.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/restart.py:14 msgid "&Restart" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/restart.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/restart.py:14 msgid "Ctrl+R" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:24 msgid "Save single format to disk..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:40 msgid "S" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:40 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:46 msgid "Save to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:48 msgid "Save to disk in a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:50 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:69 msgid "Save only %s format to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:72 msgid "Save only %s format to disk in a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:91 msgid "Cannot save to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:94 msgid "Choose destination directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:102 msgid "You are trying to save files into the calibre library. This can cause corruption of your library. Save to disk is meant to export files from your calibre library elsewhere." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:136 msgid "Error while saving" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:137 msgid "There was an error while saving." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:144 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:145 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:144 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:145 msgid "Could not save some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:146 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:146 msgid "Click the show details button to see which ones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:16 msgid "Show book details" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:17 msgid "I" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:26 msgid "No detailed info available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:27 msgid "No detailed information is available for books on the device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:17 msgid "Similar books..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:24 msgid "Alt+A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:24 msgid "Books by same author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:25 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:25 msgid "Books in this series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:26 msgid "Alt+Shift+S" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:27 msgid "Alt+P" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:27 msgid "Books by this publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:28 msgid "Alt+T" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:28 msgid "Books with the same tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:54 msgid "Tweak ePub" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:16 msgid "Make small changes to ePub format books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:17 msgid "T" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:39 msgid "Cannot tweak ePub" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:40 msgid "No ePub available. First convert the book to ePub." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:24 msgid "V" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:24 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:32 msgid "View" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:33 msgid "View specific format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:95 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:156 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:156 msgid "Cannot view" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:77 msgid "Choose the format to view" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:109 msgid "Multiple Books Selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:110 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:119 msgid "Cannot open folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:157 +#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:157 msgid "%s has no available formats." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54 msgid "Searching in" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:197 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:197 msgid "Adding..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:210 msgid "Searching in all sub-directories..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:223 msgid "Path error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:224 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:224 msgid "The specified directory could not be processed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:228 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:811 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:228 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:811 msgid "No books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:293 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:293 msgid "Added" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:306 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:306 msgid "Adding failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:307 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:307 msgid "The add books process seems to have hung. Try restarting calibre and adding the books in smaller increments, until you find the problem book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:322 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:322 msgid "Duplicates found!" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323 msgid "Books with the same title as the following already exist in the database. Add them anyway?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:326 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:326 msgid "Adding duplicates..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:393 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:393 msgid "Saving..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add.py:446 +#: /home/kovid/work/trunk/src/calibre/gui2/add.py:446 msgid "Saved" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:57 msgid "Searching for sub-folders" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:62 msgid "Searching for books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:74 msgid "Looking for duplicates based on file hash" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109 -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:70 msgid "Choose root folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:137 msgid "Invalid root folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:138 msgid "is not a valid root folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:148 msgid "Add books to calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21 -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:62 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:41 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:41 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41 msgid "WizardPage" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:22 msgid "Scanning root folder for books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:23 msgid "This may take a few minutes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:63 msgid "Choose the location to add books from" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:64 msgid "Select a folder on your hard disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:65 msgid "" "<p>calibre can scan your computer for existing books automatically. These books will then be <b>copied</b> into the calibre library. This wizard will help you customize the scanning and import process for your existing book collection.</p>\n" "<p>Choose a root folder. Books will be searched for only inside this folder and any sub-folders.</p>\n" "<p>Make sure that the folder you chose for your calibre library <b>is not</b> under the root folder you choose.</p>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:68 msgid "&Root folder:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:69 msgid "This folder and its sub-folders will be scanned for books to import into calibre's library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:71 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:77 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:418 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:95 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:171 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:140 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:82 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:156 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:157 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:87 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:89 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:90 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:87 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:89 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:90 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:88 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:103 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:105 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:108 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:110 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:382 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:407 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:409 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:411 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:418 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:161 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:164 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:168 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:171 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:156 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:157 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191 msgid "..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:72 msgid "Handle multiple files per book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:73 msgid "&One book per folder, assumes every ebook file in a folder is the same book in a different format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:74 msgid "&Multiple books per folder, assumes every ebook file is a different book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:45 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:311 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:308 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1067 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:23 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:311 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:308 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1067 msgid "Path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:307 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:307 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:102 msgid "Formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:886 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1070 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:25 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:886 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1070 msgid "Collections" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47 -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:56 msgid "Click to open" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:300 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:306 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:312 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1076 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1080 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:293 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:300 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:306 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:312 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1076 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1080 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:293 msgid "None" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:310 +#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:310 msgid "Click to open Book Details window" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:16 msgid "BibTeX Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17 msgid "Options specific to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17 msgid "output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:88 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:31 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67 -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:105 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:46 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:67 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:123 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:49 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/conversion_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107 msgid "Form" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82 msgid "Bib file encoding:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38 msgid "Fields to include in output:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84 msgid "ascii/LaTeX" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85 msgid "Encoding configuration (change if you have errors) :" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:86 msgid "strict" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:87 msgid "replace" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:88 msgid "ignore" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:89 msgid "backslashreplace" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:90 msgid "BibTeX entry type:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:91 msgid "mixed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:92 msgid "misc" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:93 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:93 msgid "book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:94 msgid "Create a citation tag?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:95 msgid "Expression to form the BibTeX citation tag:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:96 msgid "" "Some explanation about this template:\n" " -The fields availables are 'author_sort', 'authors', 'id',\n" @@ -3918,1702 +3926,1694 @@ msgid "" " -For time field, only the date will be used. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16 msgid "CSV/XML Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17 msgid "E-book options" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77 msgid "'Don't include this book' tag:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78 msgid "'Mark this book as read' tag:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:79 msgid "Additional note tag prefix:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:80 msgid "Regex pattern describing tags to exclude as genres:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:81 msgid "" "Regex tips:\n" "- The default regex - \\[.+\\] - excludes genre tags of the form [tag], e.g., [Amazon Freebie]\n" "- A regex pattern of a single dot excludes all genre tags, generating no Genre Section" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:84 msgid "Include 'Titles' Section" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:85 msgid "Include 'Recently Added' Section" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:86 msgid "Sort numbers as text" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:87 msgid "Include 'Series' Section" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28 msgid "Tab template for catalog.ui" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36 msgid "For settings that cannot be specified in this dialog, use the values saved in a previous conversion (if they exist) instead of using the defaults specified in the Preferences" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:68 msgid "Bulk Convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:81 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:185 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185 msgid "Options specific to the output format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:15 msgid "Comic Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13 msgid "input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:89 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99 msgid "&Number of Colors:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:90 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101 msgid "Disable &normalize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102 msgid "Keep &aspect ratio" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103 msgid "Disable &Sharpening" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:93 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:109 msgid "Disable &Trimming" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:108 msgid "&Wide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104 msgid "&Landscape" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:96 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:106 msgid "&Right to left" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:97 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:105 msgid "Don't so&rt" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:107 msgid "De&speckle" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:99 msgid "&Disable comic processing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:100 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:120 msgid "&Output format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101 msgid "Disable conversion of images to &black and white" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:19 msgid "Debug" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21 msgid "Debug the conversion process." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:39 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:56 msgid "Choose debug folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58 msgid "Invalid debug directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:59 msgid "Failed to create debug directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:55 msgid "Choose a folder to put the debug output into. If you specify a folder, calibre will place a lot of debug output into it. This will be useful in understanding the conversion process and figuring out the correct values for conversion parameters like Table of Contents and Chapter Detection." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:59 msgid "The debug process outputs the intermediate HTML generated at various stages of the conversion process. This HTML can sometimes serve as a good starting point for hand editing a conversion." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:15 msgid "EPUB Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49 msgid "Do not &split on page breaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50 msgid "No default &cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51 msgid "No &SVG cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52 msgid "Preserve cover &aspect ratio" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53 msgid "Split files &larger than:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54 msgid " KB" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12 msgid "FB2 Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29 msgid "Do not insert a &Table of Contents at the beginning of the book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:14 msgid "FB2 Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:37 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:29 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47 msgid "&Inline TOC" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:33 msgid "Sectionize Chapters (Use with care!)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104 msgid "Font rescaling wizard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:105 msgid "" "<p>This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.</p>\n" "<p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. </p>\n" "<p>See the <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> for a discussion of how font size rescaling works.</p>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108 msgid "&Output document" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114 msgid "&Base font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126 msgid "Font size &key:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:115 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:117 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:118 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127 msgid " pt" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112 msgid "Use &default values" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113 msgid "&Input document" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:116 msgid "&Font size: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:118 msgid " will map to size: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:119 msgid "0.0 pt" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16 msgid "Look & Feel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18 msgid "Control the look and feel of the output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31 msgid "Original" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32 msgid "Left align" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:33 msgid "Justify text" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123 msgid "&Disable font size rescaling" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124 msgid "Base &font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127 msgid "Wizard to help you choose an appropriate font size key" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129 msgid "Line &height:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131 msgid "Input character &encoding:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132 msgid "Remove &spacing between paragraphs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133 msgid "Indent size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134 msgid "<p>When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135 msgid " em" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136 msgid "Text justification:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137 msgid "&Linearize tables" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138 msgid "Extra &CSS" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:139 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:139 msgid "&Transliterate unicode characters to ASCII" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:140 msgid "Insert &blank line" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:141 msgid "Keep &ligatures" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:142 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:142 msgid "Smarten &punctuation" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19 msgid "LRF Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116 msgid "Enable &autorotation of wide images" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117 msgid "&Wordspace:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119 msgid "Minimum para. &indent:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121 msgid "Render &tables as images" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122 msgid "Text size multiplier for text in rendered tables:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123 msgid "Add &header" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124 msgid "Header &separation:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126 msgid "Header &format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127 msgid "&Embed fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128 msgid "&Serif font family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129 msgid "S&ans-serif font family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130 msgid "&Monospaced font family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200 msgid "Metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:43 msgid "Set the metadata. The output file will contain as much of this metadata as possible." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:165 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:165 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:109 msgid "Choose cover for " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:172 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116 msgid "Cannot read" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:173 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:173 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:117 msgid "You do not have permission to read the file: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:181 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:188 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:181 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:188 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:125 msgid "Error reading file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:182 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:126 msgid "<p>There was an error reading from file: <br /><b>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:189 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:189 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:134 msgid " is not a valid picture" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:413 msgid "Book Cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173 msgid "Use cover from &source file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:414 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:174 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:414 msgid "Change &cover image:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175 msgid "Browse for an image to use as the cover of this book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:177 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372 msgid "&Title: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:373 msgid "Change the title of this book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:230 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376 msgid "&Author(s): " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180 msgid "Author So&rt:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181 msgid "Change the author(s) of this book. Multiple authors should be separated by a comma" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:239 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:239 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:387 msgid "&Publisher: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:183 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:388 msgid "Ta&gs: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:241 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:241 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389 msgid "Tags categorize the book. This is particularly useful while searching. <br><br>They can be any words or phrases, separated by commas." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:185 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:248 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:185 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:248 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:392 msgid "&Series:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:186 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:187 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:249 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:250 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:186 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:187 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:249 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:250 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:394 msgid "List of known series. You can add new series." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:188 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:188 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:399 msgid "Book " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20 msgid "MOBI Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:43 msgid "Default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67 msgid "&Title for Table of Contents:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68 msgid "Rescale images for &Palm devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69 msgid "Use author &sort for author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70 msgid "Disable compression of the file contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71 msgid "Do not add Table of Contents to book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72 msgid "Kindle options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73 msgid "Periodical masthead font:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74 msgid "Personal Doc tag:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35 msgid "Page Setup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116 msgid "&Output profile:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117 msgid "Profile description" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118 msgid "&Input profile:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119 msgid "Margins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120 msgid "&Left:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122 msgid "&Top:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124 msgid "&Right:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126 msgid "&Bottom:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12 msgid "PDB Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:47 msgid "Treat each &line as a paragraph" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:48 msgid "Assume print formatting" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:16 msgid "PDB Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36 msgid "&Format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12 msgid "PDF Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39 msgid "Line &Un-Wrapping Factor:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40 msgid "No &Images" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17 msgid "PDF Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43 msgid "&Paper Size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44 msgid "&Orientation:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45 msgid "Preserve &aspect ratio of cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14 msgid "RB Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:83 msgid "No formats available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:84 msgid "Cannot build regex using the GUI builder without a book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:103 msgid "Open book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52 msgid "Regex Builder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53 msgid "Preview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54 msgid "Regex:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122 msgid "Test" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:171 msgid "Convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196 msgid "Options specific to the input format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:117 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:53 msgid "Dialog" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:118 msgid "&Input format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:119 msgid "Use &saved conversion settings for individual books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17 msgid "" "Structure\n" "Detection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:19 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19 msgid "Fine tune the detection of chapter headings and other document structure." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37 msgid "Detect chapters at (XPath expression):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:38 msgid "Insert page breaks before (XPath expression):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40 msgid "Header regular expression:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:43 msgid "Footer regular expression:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:59 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87 msgid "Invalid regular expression" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:60 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:88 msgid "Invalid regular expression: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39 msgid "Invalid XPath" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:66 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:40 msgid "The XPath expression %s is invalid." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:81 msgid "Chapter &mark:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:82 msgid "Remove first &image" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:83 msgid "Insert &metadata as page at start of book" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:84 msgid "Remove F&ooter" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:85 msgid "Remove H&eader" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:86 msgid "Line &un-wrap factor during preprocess:" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:87 msgid "&Preprocess input file to possibly improve structure detection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16 msgid "" "Table of\n" "Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18 msgid "Control the creation/conversion of the Table of Contents." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30 msgid "Level &1 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31 msgid "Level &2 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:32 msgid "Level &3 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63 msgid "Do not add &detected chapters to the Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:64 msgid "Number of &links to add to Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:65 msgid "Chapter &threshold" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66 msgid "&Force use of auto-generated Table of Contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:67 msgid "TOC &Filter:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12 msgid "TXT Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:49 msgid "Process using markdown" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:50 msgid "<p>Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit <a href=\"http://daringfireball.net/projects/markdown\">markdown</a>." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:51 msgid "Do not insert Table of Contents into output text when using markdown" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:52 msgid "Preserve &spaces" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:16 msgid "TXT Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:46 msgid "&Line ending style:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48 msgid "&Maximum line length:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49 msgid "Force maximum line length" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:71 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:46 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:62 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:55 msgid "TextLabel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:57 msgid "Use a wizard to help construct the XPath expression" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68 msgid "Match HTML &tags with tag name:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69 msgid "*" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70 msgid "a" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71 msgid "br" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72 msgid "div" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73 msgid "h1" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74 msgid "h2" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75 msgid "h3" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76 msgid "h4" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77 msgid "h5" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78 msgid "h6" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79 msgid "hr" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80 msgid "span" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81 msgid "Having the &attribute:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82 msgid "With &value:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83 msgid "(A regular expression)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84 msgid "<p>For example, to match all h2 tags that have class=\"chapter\", set tag to <i>h2</i>, attribute to <i>class</i> and value to <i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.</p><p>To learn more advanced usage of XPath see the <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/cover_flow.py:118 msgid "Browse by covers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:149 +#: /home/kovid/work/trunk/src/calibre/gui2/cover_flow.py:149 msgid "Cover browser could not be loaded" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:84 -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:108 -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:145 -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:164 -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:270 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:110 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:130 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:205 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:238 -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:242 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:145 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:164 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:270 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:205 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:238 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:242 msgid "Undefined" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:241 -#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 +#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:244 +#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:122 msgid "Yes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:243 -#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 +#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:246 +#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:124 msgid "No" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:122 msgid "star(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:123 msgid "Unrated" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:156 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:156 msgid "Set '%s' to today" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:266 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:266 msgid " index:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:451 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:257 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:451 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:257 msgid "Automatically number books in this series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:498 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:498 msgid "Remove all tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:519 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:519 msgid "tags to add" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:524 +#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:524 msgid "tags to remove" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:48 -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:48 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:136 msgid "No details available." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:165 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:165 msgid "Device no longer connected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:283 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:283 msgid "Get device information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:294 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:294 msgid "Get list of books on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:304 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:304 msgid "Get annotations from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:313 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:313 msgid "Send metadata to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:318 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:318 msgid "Send collections to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:342 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:342 msgid "Upload %d books to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:357 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357 msgid "Delete books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:374 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:374 msgid "Download books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:384 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:384 msgid "View book on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:418 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:418 msgid "Set default send to device action" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:424 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:424 msgid "Send to main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:426 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:426 msgid "Send to storage card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:428 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:428 msgid "Send to storage card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:433 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:442 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:433 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:442 msgid "Main Memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:453 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:453 msgid "Send and delete from library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:454 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:454 msgid "Send specific format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:490 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:490 msgid "Eject device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:608 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:608 msgid "Error communicating with device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:629 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629 msgid "Select folder to open as device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:676 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:676 msgid "Error talking to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:677 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:677 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:720 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:720 msgid "Device: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:722 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:722 msgid " detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:812 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:812 msgid "selected to send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:817 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:817 msgid "Choose format to send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:826 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:826 msgid "No device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:827 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:827 msgid "Cannot send: No device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:830 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:834 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:830 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:834 msgid "No card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:831 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:835 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:831 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:835 msgid "Cannot send: Device has no storage card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:876 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:876 msgid "E-book:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:879 msgid "Attached, you will find the e-book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:880 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:880 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:107 msgid "by" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:881 msgid "in the %s format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:894 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:894 msgid "Sending email to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:924 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:932 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1025 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1087 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1206 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1214 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:924 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:932 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1025 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1087 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1206 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1214 msgid "No suitable formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:925 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:925 msgid "Auto convert the following books before sending via email?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:933 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:933 msgid "Could not email the following books as no suitable formats were found:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:951 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:951 msgid "Failed to email books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:952 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:952 msgid "Failed to email the following books:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:956 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:956 msgid "Sent by email:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:984 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:984 msgid "News:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:985 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:985 msgid "Attached is the" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:996 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:996 msgid "Sent news to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1088 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1207 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1026 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1088 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1207 msgid "Auto convert the following books before uploading to the device?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1056 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1056 msgid "Sending catalogs to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1120 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1120 msgid "Sending news to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1173 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1173 msgid "Sending books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1215 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1215 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1277 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1277 msgid "No space on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1278 +#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1278 msgid "<p>Cannot upload books to device there is no more free space available " msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:83 msgid "Select available formats and their order for this device" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:87 msgid "Use sub directories" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:88 msgid "Use author sort for author" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:90 msgid "Save &template:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:48 msgid "Add books by ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:49 msgid "<p>Enter a list of ISBNs in the box to the left, one per line. calibre will automatically create entries for books based on the ISBN and download metadata and covers for them.<p>Any invalid ISBNs in the list will be ignored." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:50 msgid "&Paste from clipboard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:73 msgid "Fit &cover within view" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:74 msgid "&Previous" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:75 msgid "&Next" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38 msgid "My Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:301 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:304 msgid "Generate catalog" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70 msgid "Generate catalog for {0} books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71 msgid "Catalog &format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72 msgid "Catalog &title (existing catalog with the same title will be replaced):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73 msgid "&Send catalog to device automatically" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74 msgid "Catalog options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:45 msgid "Choose Format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:38 msgid "Choose location for calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:45 msgid "Same as current" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:46 msgid "The location %s contains the current calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:51 msgid "No existing library found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:52 msgid "There is no existing calibre library at %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:56 msgid "Not empty" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:57 msgid "The folder %s is not empty. Please choose an empty folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:80 msgid "No location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:80 msgid "No location selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:620 msgid "Bad location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:85 msgid "%s is not an existing folder" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:71 msgid "Choose your calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:72 msgid "Your calibre library is currently located at {0}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:73 msgid "New &Location:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:74 msgid "Use &existing library at the new location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:75 msgid "&Create an empty library at the new location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:76 msgid "&Move current library to new location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:33 msgid "Set defaults for conversion of comics (CBR/CBZ files)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48 msgid "Set options for converting %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97 msgid "&Title:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98 msgid "&Author(s):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100 msgid "&Profile:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comments_dialog_ui.py:41 msgid "Edit Comments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:55 msgid "&Show this warning again" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:47 msgid "ERROR" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:67 msgid "All checked books will be <b>permanently deleted</b> from your device. Please verify the list." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 msgid "Location" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:884 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:31 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:588 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:884 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:31 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:588 msgid "Date" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1066 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1066 msgid "Format" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50 msgid "Delete from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 msgid "Author sort" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:66 msgid "Manage authors" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:67 msgid "Sort by author" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:68 msgid "Sort by author sort" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:69 msgid "Reset all the author sort values to a value automatically generated from the author. Exactly how this value is automatically generated can be controlled via Preferences->Advanced->Tweaks" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:70 msgid "Recalculate all author sort values" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:60 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:60 msgid "Author Sort" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62 msgid "ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:162 msgid "Finding metadata..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:176 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:176 msgid "Could not find metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:177 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:177 msgid "The metadata download seems to have stalled. Try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:186 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:186 msgid "Warning" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:187 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:187 msgid "Could not fetch metadata from:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:191 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:191 msgid "No metadata found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:192 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:192 msgid "No metadata found, try adjusting the title and author or the ISBN key." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90 msgid "Fetch metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91 msgid "<p>calibre can find metadata for your books from two locations: <b>Google Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a <a href=\"http://www.isbndb.com\">free account</a> and enter your access key below." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92 msgid "&Access Key:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:93 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:93 msgid "Fetch" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:94 msgid "Matches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:95 msgid "Select the book that most closely matches your copy from the list below" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:96 msgid "Download &social metadata (tags/rating/etc.) for the selected book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:97 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:97 msgid "Overwrite author and title with author and title of selected book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/job_view_ui.py:42 msgid "Details of job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:49 msgid "Active Jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:50 msgid "&Stop selected job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:51 msgid "Show job &details" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:52 msgid "Stop &all non device jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:107 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:385 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:385 msgid "Lower Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:108 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:384 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:384 msgid "Upper Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:109 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:387 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:387 msgid "Title Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:119 msgid "Editing meta information for <b>%d books</b>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:166 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:166 msgid "Book %d:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:182 msgid "Search and replace in text fields using regular expressions. The search text is an arbitrary python-compatible regular expression. The replacement text can contain backreferences to parenthesized expressions in the pattern. The search is not anchored, and can match and replace multiple times on the same string. See <a href=\"http://docs.python.org/library/re.html\"> this reference</a> for more information, and in particular the 'sub' function." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:192 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:192 msgid "Note: <b>you can destroy your library</b> using this feature. Changes are permanent. There is no undo function. You are strongly encouraged to back up your library before proceeding." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:386 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:386 msgid "Search/replace invalid" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:387 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:387 msgid "Search pattern is invalid: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:419 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:419 msgid "Applying changes to %d books. This may take a while." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:229 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:229 msgid "Edit Meta information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:231 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:231 msgid "A&utomatically set author sort" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:232 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:232 msgid "Author s&ort: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:233 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:233 msgid "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:234 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:234 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:383 msgid "&Rating:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:235 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:236 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:235 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:236 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:384 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:385 msgid "Rating of this book. 0-5 stars" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:237 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:237 msgid "No change" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:238 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:238 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:386 msgid " stars" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:240 msgid "Add ta&gs: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:242 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:243 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:242 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:243 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:390 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391 msgid "Open Tag Editor" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:244 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:244 msgid "&Remove tags:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:245 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:245 msgid "Comma separated list of tags to remove from the books. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:246 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:246 msgid "Check this box to remove all tags from the books." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:247 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:247 msgid "Remove all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:251 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:251 msgid "Remove &format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:252 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:252 msgid "&Swap title and author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:253 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:253 msgid "" "Selected books will be automatically numbered,\n" "in the order you selected them.\n" @@ -5621,915 +5621,915 @@ msgid "" "Book A will have series number 1 and Book B series number 2." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:258 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:258 msgid "" "Remove stored conversion settings for the selected books.\n" "\n" "Future conversion of these books will use the default settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:261 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:261 msgid "Remove &stored conversion settings for the selected books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:262 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:422 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:262 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:422 msgid "&Basic metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:263 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:423 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:263 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:423 msgid "&Custom metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:264 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:264 msgid "Search &field:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:265 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:265 msgid "&Search for:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:266 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:266 msgid "&Replace with:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:267 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:267 msgid "Apply function &after replace:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:268 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:268 msgid "Test &text" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:269 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:269 msgid "Test re&sult" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:270 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:270 msgid "Your test:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:271 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:271 msgid "&Search and replace (experimental)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:91 msgid "Last modified: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:133 msgid "Not a valid picture" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:150 msgid "Specify title and author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:151 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:151 msgid "You must specify a title and author before generating a cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:169 msgid "Choose formats for " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:200 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:200 msgid "No permission" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:201 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:201 msgid "You do not have permission to read the following files:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:228 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:229 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:228 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:229 msgid "No format selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:240 msgid "Could not read metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:241 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:241 msgid "Could not read metadata from %s format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:289 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:295 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:289 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:295 msgid "Could not read cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:290 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:290 msgid "Could not read cover from %s format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:296 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:296 msgid "The cover in the %s format is invalid" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:351 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:351 msgid " The green color indicates that the current author sort matches the current author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:354 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:354 msgid " The red color indicates that the current author sort does not match the current author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:359 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:359 msgid "Abort the editing of all remaining books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:524 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:524 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529 msgid "This ISBN number is valid" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:532 msgid "This ISBN number is invalid" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611 msgid "Cannot use tag editor" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612 msgid "The tags editor cannot be used if you have modified the tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:632 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:632 msgid "Downloading cover..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:644 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:649 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:655 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:660 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:644 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:649 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:655 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:660 msgid "Cannot fetch cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:645 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:656 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:661 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:645 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:656 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:661 msgid "<b>Could not fetch cover.</b><br/>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:646 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:646 msgid "The download timed out." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:650 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:650 msgid "Could not find cover for this book. Try specifying the ISBN first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:662 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:662 msgid "For the error message from each cover source, click Show details below." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:669 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:669 msgid "Bad cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:670 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:670 msgid "The cover is not a valid picture" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:703 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:703 msgid "There were errors" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:704 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:704 msgid "There were errors downloading social metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:733 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:733 msgid "Cannot fetch metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:734 msgid "You must specify at least one of ISBN, Title, Authors or Publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:820 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:820 msgid "Permission denied" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:821 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:821 msgid "Could not open %s. Is it being used by another program?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370 msgid "Edit Meta Information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371 msgid "Meta information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374 msgid "Swap the author and title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:377 msgid "Author S&ort: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378 msgid "" "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles.\n" "If the box is colored green, then text matches the individual author's sort strings. If it is colored red, then the authors and this text do not match." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:380 msgid "" "Automatically create the author sort entry based on the current author entry.\n" "Using this button to create author sort will change author sort from red to green." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395 msgid "Remove unused series (Series that have no books)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397 msgid "IS&BN:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398 msgid "Publishe&d:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:401 msgid "dd MMM yyyy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:402 msgid "&Date:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:403 msgid "&Comments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:404 msgid "&Fetch metadata from server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:405 msgid "Available Formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:406 msgid "Add a new format for this book to the database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:408 msgid "Remove the selected formats for this book from the database." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:410 msgid "Set the cover for the book from the selected format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:412 msgid "Update metadata from the metadata in the selected format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:415 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:415 msgid "&Browse" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:416 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:416 msgid "Remove border (if any) from cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:417 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:417 msgid "Reset cover to default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:419 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:419 msgid "Download co&ver" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:420 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:420 msgid "Generate a default cover based on the title and author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:421 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:421 msgid "&Generate cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:61 msgid "Password needed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117 msgid "&Username:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:64 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:126 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119 msgid "&Password:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:130 msgid "&Show password" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:59 msgid "Aborting..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:76 msgid "Working" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor.py:54 msgid "The current saved search will be <b>permanently deleted</b>. Are you sure?" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88 msgid "Saved Search Editor" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89 msgid "Saved Search: " msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90 msgid "Select a saved search to edit" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91 msgid "Delete this selected saved search" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:93 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:93 msgid "Enter a new saved search name." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:94 msgid "Add the new saved search" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:96 msgid "Change the contents of the saved search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:120 msgid "Need username and password" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:121 msgid "You must provide a username and/or password to use this news source." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:172 msgid "Created by: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:179 msgid "Last downloaded: never" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:194 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:194 msgid "%d days, %d hours and %d minutes ago" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:196 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:196 msgid "Last downloaded" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:220 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:220 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197 msgid "Schedule news download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:223 msgid "Add a custom news source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:228 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:228 msgid "Download all scheduled new sources" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:328 msgid "No internet connection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:329 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:329 msgid "Cannot download news as no internet connection is active" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278 msgid "Recipes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199 msgid "Download all scheduled recipes at once" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200 msgid "Download &all scheduled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201 msgid "blurb" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202 msgid "&Schedule for download:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213 msgid "Every " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204 msgid "day" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205 msgid "Monday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206 msgid "Tuesday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207 msgid "Wednesday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208 msgid "Thursday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209 msgid "Friday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210 msgid "Saturday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211 msgid "Sunday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212 msgid "at" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214 msgid "Interval at which to download this recipe. A value of zero means that the recipe will be downloaded every hour." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:227 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:227 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268 msgid " days" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216 msgid "&Account" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220 msgid "For the scheduling to work, you must leave calibre running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221 msgid "&Schedule" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222 msgid "Add &title as tag" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223 msgid "&Extra tags:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:224 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:224 msgid "&Advanced" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:225 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:225 msgid "&Download now" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:226 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:226 msgid "Delete downloaded news older than the specified number of days. Set to zero to disable." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:228 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:228 msgid "Delete downloaded news older than " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36 msgid "contains" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37 msgid "The text to search for. It is interpreted as a regular expression." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38 msgid "<p>Negate this match. That is, only return results that <b>do not</b> match this query." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39 msgid "Negate" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118 msgid "Advanced Search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119 msgid "Find entries that have..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120 msgid "&All these words:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121 msgid "This exact &phrase:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:122 msgid "&One or more of these words:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:123 msgid "But dont show entries that have..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:124 msgid "Any of these &unwanted words:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125 msgid "What kind of match to use:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:126 msgid "Contains: the word or phrase matches anywhere in the metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:127 msgid "Equals: the word or phrase must match an entire metadata field" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:128 msgid "Regular expression: the expression must match anywhere in the metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:129 msgid " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:130 msgid "See the <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-interface\">User Manual</a> for more help" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45 msgid "Choose formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:82 msgid "Authors" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:113 msgid "Publishers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:114 msgid " (not on any book)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:166 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:166 msgid "The current tag category will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:158 msgid "User Categories Editor" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:159 msgid "A&vailable items" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:160 msgid "Apply tags to current tag category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:162 msgid "A&pplied items" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:163 msgid "Unapply (remove) tag from current tag category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:165 msgid "Category name: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:166 msgid "Select a category to edit" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:167 msgid "Delete this selected tag category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:169 msgid "Enter a new category name. Select the kind before adding it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:170 msgid "Add the new category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:172 msgid "Category filter: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:173 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:173 msgid "Select the content kind of the new category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:105 msgid "Are your sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor.py:69 msgid "The following tags are used by one or more books. Are you certain you want to delete them?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128 msgid "Tag Editor" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129 msgid "A&vailable tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130 msgid "Delete tag from database. This will unapply the tag from all books and then remove it from the database." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132 msgid "Apply tag to current book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134 msgid "A&pplied tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135 msgid "Unapply (remove) tag from current book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:137 msgid "&Add tag:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:138 msgid "If the tag you want is not in the available list, you can add it here. Accepts a comma separated list of tags." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:139 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:139 msgid "Add tag to available tags and apply it to current book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:20 msgid "%s (was %s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:74 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:501 msgid "Item is blank" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:502 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:502 msgid "An item cannot be set to nothing. Delete it instead." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:91 msgid "No item selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:92 msgid "You must select one item from the list of Available items." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:101 msgid "No items selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:102 msgid "You must select at least one items from the list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:106 msgid "Are you certain you want to delete the following items?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77 msgid "Category Editor" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 msgid "Items in use" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:79 msgid "Delete item from database. This will unapply the item from all books and then remove it from the database." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:81 msgid "Rename the item in every book where it is used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:106 msgid "Ctrl+S" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:56 msgid "Test email settings" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:57 msgid "Send test mail from %s to:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120 msgid "&Test" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:55 msgid "Display contents of exploded ePub" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:56 msgid "&Explode ePub" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:57 msgid "Rebuild ePub from exploded contents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:58 msgid "&Rebuild ePub" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:59 msgid "Discard changes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:218 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:60 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:218 msgid "&Cancel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:61 msgid "Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window. Rebuild the ePub, updating your calibre library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:127 msgid "No recipe selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132 msgid "The attached file: %s is a recipe to download %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:133 msgid "Recipe for " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:150 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260 msgid "Switch to Advanced mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:156 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164 msgid "Switch to Basic mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:174 msgid "Feed must have a title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175 msgid "The feed must have a title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179 msgid "Feed must have a URL" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180 msgid "The feed %s must have a URL" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186 msgid "This feed has already been added to the recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:227 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:286 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:227 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286 msgid "Invalid input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:287 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:228 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287 msgid "<p>Could not create recipe. Error:<br>%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:241 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:263 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:290 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:241 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290 msgid "Replace recipe?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:242 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:264 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:291 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:242 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291 msgid "A custom recipe named %s already exists. Do you want to replace it?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257 msgid "Pick recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257 msgid "Pick the recipe to customize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277 msgid "Choose a recipe file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253 msgid "Add custom news source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254 msgid "Available user recipes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255 msgid "Add/Update &recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256 msgid "&Remove recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:257 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:257 msgid "&Share recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:258 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:258 msgid "Customize &builtin recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:259 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:259 msgid "&Load recipe from file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261 msgid "" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" @@ -6537,60 +6537,60 @@ msgid "" "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news recipe, by adding RSS feeds to it. <br />For most feeds, you will have to use the \"Advanced mode\" to further customize the fetch process.</p></body></html>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265 msgid "Recipe &title:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266 msgid "&Oldest article:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267 msgid "The oldest article to download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269 msgid "&Max. number of articles per feed:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270 msgid "Maximum number of articles to download per feed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271 msgid "Feeds in recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273 msgid "Remove feed from recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:279 msgid "Add feed to recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277 msgid "&Feed title:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:278 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:278 msgid "Feed &URL:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:280 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:280 msgid "&Add feed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:281 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:281 msgid "For help with writing advanced news recipes, please visit <a href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:282 +#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:282 msgid "Recipe source code (python)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:112 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" @@ -6601,558 +6601,562 @@ msgid "" "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" font-weight:600;\">Test</span> functionality below to test your regular expression on a few sample filenames. The group names for the various metadata entries are documented in tooltips.</p></body></html>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119 msgid "Regular &expression" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121 msgid "File &name:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123 msgid "Title:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124 msgid "Regular expression (?P<title>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:103 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:98 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:110 msgid "No match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126 msgid "Authors:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127 msgid "Regular expression (?P<author>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129 msgid "Series:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130 msgid "Regular expression (?P<series>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132 msgid "Series index:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:133 msgid "Regular expression (?P<series_index>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:135 msgid "ISBN:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:136 msgid "Regular expression (?P<isbn>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:100 msgid "Cover Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:105 msgid "Shift+Alt+B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:119 msgid "Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:121 msgid "Shift+Alt+T" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:141 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:29 msgid "version" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:142 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:142 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:30 msgid "created by Kovid Goyal" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:160 msgid "Connected " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:172 msgid "Update found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:207 -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:217 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:207 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:217 msgid "Book Details" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:209 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:209 msgid "Alt+D" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/init.py:219 +#: /home/kovid/work/trunk/src/calibre/gui2/init.py:219 msgid "Shift+Alt+D" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:61 msgid "Job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:62 msgid "Status" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:63 msgid "Progress" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:64 msgid "Running time" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:76 msgid "There are %d running jobs:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:87 -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:80 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:102 msgid "Unknown job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:83 msgid "There are %d waiting jobs:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219 -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:222 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:219 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:222 msgid "Cannot kill job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:220 msgid "Cannot kill jobs that communicate with the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:223 msgid "Job has already run" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:251 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:251 msgid "Unavailable" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:283 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:283 msgid "Jobs:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:285 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:285 msgid "Shift+Alt+J" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:302 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:302 msgid "Click to see list of jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:371 +#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:371 msgid " - Jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:53 msgid "Eject this device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:62 -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:62 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:210 msgid "Library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:63 msgid "Show books in calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:64 msgid "Device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:65 msgid "Show books in the main memory of the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:655 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:66 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:655 msgid "Card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:67 msgid "Show books in storage card A" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:68 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:657 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:68 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:657 msgid "Card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:69 msgid "Show books in storage card B" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:109 msgid "available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:140 msgid "Books display will be restricted to those matching the selected saved search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:153 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:153 msgid "Advanced search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:155 +msgid "&Search:" +msgstr "" + +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:162 msgid "<p>Search the list of books by title, author, publisher, tags, comments, etc.<br><br>Words separated by spaces are ANDed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:169 msgid "Reset Quick Search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:181 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:181 msgid "Copy current search text (instead of search name)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:187 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:187 msgid "Save current search under the name shown in the box" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:193 msgid "Delete current saved search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:284 msgid "N" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:284 +#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:284 msgid "Y" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:66 msgid "On Device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:68 msgid "Size (MB)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:319 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1086 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:319 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1086 msgid "Book <font face=\"serif\">%s</font> of %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:674 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1184 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:401 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:674 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1184 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:401 msgid "The lookup/search name is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:881 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:881 msgid "In Library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:885 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:885 msgid "Size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1164 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1164 msgid "Marked for deletion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1167 +#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1167 msgid "Double click to <b>edit</b> me<br><br>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:114 msgid "Hide column %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:119 msgid "Sort on %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:120 msgid "Ascending" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:123 msgid "Descending" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:135 msgid "Change text alignment for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:137 msgid "Left" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:137 msgid "Right" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:138 msgid "Center" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:157 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:157 msgid "Show column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:169 msgid "Restore default layout" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:585 +#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:585 msgid "Dropping onto a device is not supported. First add the book to the calibre library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:52 msgid "Configure Viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:53 msgid "Use white background" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:54 msgid "Hyphenate" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:55 msgid "<b>Changes will only take effect after a restart.</b>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70 msgid " - LRF Viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:433 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:433 msgid "No matches found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133 msgid "LRF Viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134 msgid "Parsing LRF file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135 msgid "LRF Viewer toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:477 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477 msgid "Next Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:478 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:478 msgid "Previous Page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:138 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193 msgid "Back" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:139 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:139 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194 msgid "Forward" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:140 msgid "Next match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:141 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201 msgid "Open ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:142 +#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:142 msgid "Configure" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:30 msgid "Use the library located at the specified path." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:32 msgid "Start minimized to system tray." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:34 msgid "Log debugging information to console" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:36 msgid "Do not check for updates" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:598 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:628 msgid "Calibre Library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:86 msgid "Choose a location for your calibre e-book library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:95 msgid "Failed to create library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:96 msgid "Failed to create calibre library at: %r." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:184 msgid "Choose a location for your new calibre e-book library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:153 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:153 msgid "Initializing user interface..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:178 msgid "Repairing failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:179 msgid "The database repair failed. Starting with a new empty library." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:193 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:226 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:226 msgid "Bad database location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:194 msgid "Bad database location %r. calibre will now quit." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207 msgid "Corrupted database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:208 msgid "Your calibre database appears to be corrupted. Do you want calibre to try and repair it automatically? If you say No, a new empty calibre library will be created." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:214 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:214 msgid "Repairing database. This can take a very long time for a large collection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:227 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:227 msgid "Bad database location %r. Will start with a new, empty calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:238 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:238 msgid "Starting %s: Loading books..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:283 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:283 msgid "If you are sure it is not running" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:285 msgid "Cannot Start " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:286 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:286 msgid "%s is already running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:289 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:289 msgid "may be running in the system tray, in the" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:291 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:291 msgid "upper right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:293 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:293 msgid "lower right region of the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:296 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:296 msgid "try rebooting your computer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:298 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:310 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:298 +#: /home/kovid/work/trunk/src/calibre/gui2/main.py:310 msgid "try deleting the file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20 +#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20 msgid "Redirect console output to a dialog window (both stdout and stderr). Useful on windows where GUI apps do not have a output streams." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:61 msgid "&Preferences" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62 msgid "&Quit" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90 +#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90 msgid "ERROR: Unhandled exception" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:93 +#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:93 msgid "Book has neither title nor ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:119 msgid "No matches found for this book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/__init__.py:36 msgid "Restore settings to default values. You have to click Apply to actually save the default settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:49 msgid "Here you can control how calibre will read metadata from the files you add to it. calibre can either read metadata from the contents of the file, or from the filename." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:50 msgid "Read metadata from &file contents rather than file name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:51 msgid "" "If an existing book with a similar title and author is found that does not have the format being added, the format is added\n" "to the existing book, instead of creating a new entry. If the existing book already has the format, then it is silently ignored.\n" @@ -7160,277 +7164,277 @@ msgid "" "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), punctuation, case, etc. Author match is exact." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:55 msgid "If books with similar titles and authors found, &merge the new files automatically" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:56 msgid "&Configure metadata from file name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:57 msgid "Swap the firstname and lastname of the author. This affects only metadata read from file names." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:58 msgid "&Swap author firstname and lastname" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:145 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:145 msgid "Normal" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:146 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:146 msgid "High" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:147 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:147 msgid "Low" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:162 msgid "Done" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:163 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:163 msgid "Confirmation dialogs have all been reset" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:137 msgid "&Overwrite author and title by default when fetching metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:138 msgid "Download &social metadata (tags/ratings/etc.) by default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:139 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:139 msgid "Show notification when &new version is available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:140 msgid "Automatically send downloaded &news to ebook reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:141 msgid "&Delete news from library when it is automatically sent to reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:142 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:142 msgid "Default network &timeout:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:143 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:143 msgid "Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:144 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:144 msgid " seconds" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:148 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:148 msgid "Job &priority:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:149 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:149 msgid "Preferred &output format:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:150 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:150 msgid "Restriction to apply when the current library is opened:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:151 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:151 msgid "Apply this restriction on calibre startup if the current library is being used. Also applied when switching to this library. Note that this setting is per library. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:152 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:152 msgid "A comma-separated list of tags that will be applied to books added to the library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:153 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:153 msgid "Tags to apply when adding a book:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:154 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:154 msgid "Reset all disabled &confirmation dialogs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:155 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:155 msgid "Preferred &input format order:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:158 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:158 msgid "Use internal &viewer for:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:96 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:96 msgid "You must select a column to delete it" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:101 msgid "The selected column is not a custom column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:103 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:103 msgid "Do you really want to delete column %s and all its data?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:82 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:82 msgid "Here you can re-arrange the layout of the columns in the calibre library book list. You can hide columns by unchecking them. You can also create your own, custom columns." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:84 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:84 msgid "Remove a user-defined column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:86 msgid "Add a user-defined column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:88 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:88 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:88 msgid "Edit settings of a user-defined column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:91 msgid "Add &custom column" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/conversion.py:37 msgid "Restore settings to default values. Only settings for the currently selected section are restored." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:19 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:19 msgid "Text, column shown in the tag browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:22 msgid "Comma separated text, like tags, shown in the tag browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:25 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:25 msgid "Long text, like comments, not shown in the tag browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:28 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:28 msgid "Text column for keeping series-like information" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:33 msgid "Floating point numbers" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:35 msgid "Integers" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:37 msgid "Ratings, shown with stars" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:40 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:40 msgid "Yes/No" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:69 msgid "No column selected" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:70 msgid "No column has been selected" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:74 msgid "Selected column is not a user-defined column" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:105 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:105 msgid "No lookup name was provided" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:107 msgid "The lookup name must contain only lower case letters, digits and underscores, and start with a letter" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:109 msgid "Lookup names cannot end with _index, because these names are reserved for the index of a series column." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:118 msgid "No column heading was provided" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:124 msgid "The lookup name %s is already used" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:134 msgid "The heading %s is already used" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:106 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:122 msgid "Create or edit custom columns" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:107 msgid "&Lookup name" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:108 msgid "Column &heading" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:109 msgid "Used for searching the column. Must contain only digits and lower case letters." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:110 msgid "Column heading in the library view and category name in the tag browser" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:111 msgid "Column &type" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:112 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:112 msgid "What kind of information will be kept in the column." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:113 msgid "" "<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's for year.</p>\n" "<p>For example:\n" @@ -7441,1646 +7445,1647 @@ msgid "" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:119 msgid "Use MMM yyyy for month + year, yyyy for year only" msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:120 msgid "Default: dd MMM yyyy." msgstr "" #: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:121 msgid "Format for &dates" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:21 msgid "Getting debug information" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:22 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:22 msgid "Copy to &clipboard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:24 msgid "Debug device detection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:66 msgid "calibre can send your books to you (or your reader) by email. Emails will be automatically sent for downloaded news to all email addresses that have Auto-send checked." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:67 msgid "Add an email address to which to send books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:68 msgid "&Add email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:69 msgid "Make &default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:70 msgid "&Remove email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 msgid "Auto send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 msgid "Email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:29 msgid "Formats to email. The first matching format will be sent." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:30 msgid "If checked, downloaded news will be automatically mailed <br>to this email address (provided it is in one of the listed formats)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:104 msgid "new email address" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:24 msgid "Narrow" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:24 msgid "Wide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:51 msgid "Medium" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:51 msgid "Small" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:52 msgid "Large" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:55 msgid "Always" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:55 msgid "Automatic" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:56 msgid "Never" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:106 msgid "User Interface &layout (needs restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:107 msgid "&Number of covers to show in browse mode (needs restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:108 msgid "Choose &language (requires restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:109 msgid "Show &average ratings in the tags browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:110 msgid "Disable all animations. Useful if you have a slow/old computer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:111 msgid "Disable &animations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:112 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:112 msgid "Enable system &tray icon (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:113 msgid "Show &splash screen at startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:114 msgid "Disable ¬ifications in system tray" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:115 msgid "Use &Roman numerals for series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:116 msgid "Show cover &browser in a separate window (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:117 msgid "Search as you type" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:118 msgid "&Toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:119 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:119 msgid "&Icon size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:120 msgid "Show &text under icons:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:121 msgid "&Split the toolbar into two toolbars" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:215 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:215 msgid "&Apply" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:222 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:222 msgid "Restore &defaults" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:223 msgid "Save changes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:224 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:224 msgid "Cancel and return to overview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:259 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:259 msgid "Restoring to defaults not supported for" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:294 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:294 msgid "Some of the changes you made require a restart. Please restart calibre as soon as possible." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:297 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:297 msgid "The changes you have made require calibre be restarted immediately. You will not be allowed set any more preferences, until you restart." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:302 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:120 msgid "Restart needed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:49 msgid "Checking database integrity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:66 msgid "Failed to check database integrity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:71 msgid "Some inconsistencies found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:72 msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:113 msgid "Failed to install command line tools." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:116 msgid "Command line tools installed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:117 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:117 msgid "Command line tools installed in" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:118 msgid "If you move calibre.app, you have to re-install the command line tools." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:64 msgid "&Maximum number of waiting worker processes (needs restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:65 msgid "Limit the max. simultaneous jobs to the available CPU &cores" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:66 msgid "Debug &device detection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:67 msgid "&Check database integrity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:68 msgid "Open calibre &configuration directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:69 msgid "&Install command line tools" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:100 msgid "%(plugin_type)s %(plugins)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:101 msgid "plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:110 msgid "" "\n" "Customization: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:155 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:155 msgid "No valid plugin path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:156 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:156 msgid "%s is not a valid plugin path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:159 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:159 msgid "Choose plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:171 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:171 msgid "Plugin cannot be disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:172 msgid "The plugin: %s cannot be disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:182 msgid "Plugin not customizable" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:183 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:183 msgid "Plugin: %s does not need customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:193 msgid "Customize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:232 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:232 msgid "Cannot remove builtin plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:233 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:233 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:82 msgid "Here you can customize the behavior of Calibre by controlling what plugins it uses." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:83 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:83 msgid "Enable/&Disable plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:84 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:84 msgid "&Customize plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:85 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:85 msgid "&Remove plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:86 msgid "Add new plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:87 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:87 msgid "Plugin &file:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:89 msgid "&Add" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template.py:51 msgid "Invalid template" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template.py:52 msgid "The template %s is invalid:" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:47 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:47 msgid "Save &template" msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:48 msgid "By adjusting the template below, you can control what folders the files are saved in and what filenames they are given. You can use the / character to indicate sub-folders. Available metadata variables are described below. If a particular book does not have some metadata, the variable will be replaced by the empty string." msgstr "" -#: -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:49 msgid "Available variables:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:68 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:68 msgid "Here you can control how calibre will save your books when you click the Save to Disk button:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:69 msgid "Save &cover separately" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:70 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:70 msgid "Replace space with &underscores" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:71 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:71 msgid "Update &metadata in saved copies" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:72 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:72 msgid "Change paths to &lowercase" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:73 msgid "Format &dates as:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:74 msgid "File &formats to save:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:75 msgid "Convert non-English characters to &English equivalents" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:76 msgid "Save metadata in &OPF file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:25 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:63 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:25 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:63 msgid "Manual management" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:26 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:26 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:64 msgid "Only on send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:65 msgid "Automatic management" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:62 msgid "Metadata &management:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:66 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:66 msgid "" "<li><b>Manual management</b>: Calibre updates the metadata and adds collections only when a book is sent. With this option, calibre will never remove a collection.</li>\n" "<li><b>Only on send</b>: Calibre updates metadata and adds/removes collections for a book only when it is sent to the device. </li>\n" "<li><b>Automatic management</b>: Calibre automatically keeps metadata on the device in sync with the calibre library, on every connect</li></ul>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:69 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:69 msgid "Here you can control how calibre will save your books when you click the Send to Device button. This setting can be overriden for individual devices by customizing the device interface plugins in Preferences->Advanced->Plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:320 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:320 msgid "Failed to start content server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:99 msgid "Error log:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:106 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:106 msgid "Access log:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:121 msgid "You need to restart the server for changes to take effect" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:124 msgid "Server &port:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:127 msgid "If you leave the password blank, anyone will be able to access your book collection using the web interface." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:128 msgid "The maximum size (widthxheight) for displayed covers. Larger covers are resized. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:129 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:129 msgid "Max. &cover size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:131 msgid "Max. &OPDS items per query:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:132 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:132 msgid "Max. OPDS &ungrouped items:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:133 msgid "Restriction (saved search) to apply:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:134 msgid "This restriction (based on a saved search) will restrict the books the content server makes available to those matching the search. This setting is per library (i.e. you can have a different restriction per library)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:135 msgid "&Start Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:136 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:136 msgid "St&op Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:137 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:137 msgid "&Test Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:138 msgid "calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:139 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:139 msgid "Run server &automatically on startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:140 msgid "View &server logs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:141 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46 msgid "" "<p>Remember to leave calibre running as the server only runs as long as calibre is running.\n" "<p>Stanza should see your calibre collection automatically. If not, try adding the URL http://myhostname:8080 as a new catalog in the Stanza reader on your iPhone. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/social.py:34 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/social.py:34 msgid "Downloading social metadata, please wait..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:36 msgid "Switch between library and device views" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:39 msgid "Separator" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:52 msgid "Choose library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:202 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:202 msgid "The main toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:203 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:203 msgid "The main toolbar when a device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:204 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:204 msgid "The context menu for the books in the calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:206 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:206 msgid "The context menu for the books on the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:240 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:240 msgid "Cannot add" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:241 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:241 msgid "Cannot add the actions %s to this location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:259 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:259 msgid "Cannot remove" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:260 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:260 msgid "Cannot remove the actions %s from this location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:99 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:99 msgid "Customize the actions in:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:100 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:100 msgid "A&vailable actions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:101 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:101 msgid "&Current actions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:102 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:102 msgid "Move selected action up" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:104 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:104 msgid "Move selected action down" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:107 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:107 msgid "Add selected actions to toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:109 msgid "Remove selected actions from toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks.py:43 msgid "Invalid tweaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks.py:44 msgid "The tweaks you entered are invalid, try resetting the tweaks to default and changing them one by one until you find the invalid setting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:50 msgid "Values for the tweaks are shown below. Edit them to change the behavior of calibre. Your changes will only take effect after a restart of calibre." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:51 msgid "All available tweaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:52 msgid "&Current tweaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:95 -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:261 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:573 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:95 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:261 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:573 msgid "Search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:313 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:355 msgid "Search (For Advanced Search click the button to the left)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:397 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:397 msgid "Saved Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:405 +#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:405 msgid "Choose saved search or enter name for new saved search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10 +#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:10 msgid "Restrict to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:65 +#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:16 +#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:65 msgid "(all books)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:59 msgid "({0} of {1})" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:67 +#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:67 msgid "({0} of all)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58 msgid "Press a key..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79 msgid "Already assigned" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81 msgid "already assigned to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223 msgid " or " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:74 msgid "&Default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135 msgid "Customize shortcuts for" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223 msgid "Keys" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225 msgid "Double click to change" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73 msgid "Frame" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75 msgid "&Custom" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:76 msgid "&Shortcut:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77 -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:82 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:82 msgid "Click to change" msgstr "" -#: /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/trunk/src/calibre/gui2/shortcuts_ui.py:79 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:84 msgid "Clear" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:81 msgid "&Alternate shortcut:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:193 msgid "Rename '%s'" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:197 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:197 msgid "Edit sort for '%s'" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:202 msgid "Hide category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:205 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:205 msgid "Show category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:209 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:209 msgid "Show all categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:216 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:220 msgid "Manage %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:223 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:223 msgid "Manage Saved Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:234 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:230 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:234 msgid "Manage User Categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:304 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:433 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:304 msgid "Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:511 msgid "Duplicate search name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:512 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:512 msgid "The saved search name %s is already used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:769 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:769 msgid "Sort by name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:769 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:769 msgid "Sort by popularity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:770 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:770 msgid "Sort by average rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:773 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:773 msgid "Set the sort order for entries in the Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:779 msgid "Match all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:779 msgid "Match any" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:784 msgid "When selecting multiple entries in the Tag Browser match any or all of them" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:788 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:788 msgid "Manage &user categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791 +#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:791 msgid "Add your own categories to the Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:64 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:183 msgid "Convert book %d of %d (%s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:91 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203 msgid "Could not convert some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:92 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:204 msgid "Could not convert %d of %d books, because no suitable source format was found." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:121 msgid "Queueing books for bulk conversion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182 msgid "Queueing " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:243 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:246 msgid "Fetch news from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:313 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:316 msgid "Convert existing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:314 +#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:317 msgid "The following books have already been converted to %s format. Do you wish to reconvert them?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:168 msgid "&Restore" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:170 msgid "&Donate to support calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:174 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:174 msgid "&Eject connected device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:216 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:216 msgid "Calibre Quick Start Guide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:418 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:446 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:418 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:446 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:419 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:419 msgid "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must first remove the DRM using third party tools." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:432 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:432 msgid "Recipe Disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:447 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:447 msgid "<b>Failed</b>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:483 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:483 msgid "is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development. Your donation helps keep calibre development going." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:509 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:509 msgid "There are active jobs. Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:512 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:512 msgid "" " is communicating with the device!<br>\n" " Quitting may cause corruption on the device.<br>\n" " Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:516 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:516 msgid "WARNING: Active jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584 +#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:584 msgid "will keep running in the system tray. To close it, choose <b>Quit</b> in the context menu of the system tray." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/update.py:56 msgid "Update available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/update.py:57 msgid "%s has been updated to version %s. See the <a href=\"http://calibre-ebook.com/whats-new\">new features</a>. Visit the download page?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43 msgid "Edit bookmark" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43 msgid "New title for bookmark:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52 msgid "Export Bookmarks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54 msgid "Saved Bookmarks (*.pickle)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62 msgid "Import Bookmarks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62 msgid "Pickled Bookmarks (*.pickle)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89 msgid "Name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56 msgid "Bookmark Manager" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57 msgid "Actions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58 msgid "Edit" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59 msgid "Delete" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60 msgid "Reset" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61 msgid "Export" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62 msgid "Import" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159 msgid "Configure Ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:160 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160 msgid "&Font options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161 msgid "Se&rif family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:162 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162 msgid "&Sans family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163 msgid "&Monospace family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164 msgid "&Default font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173 msgid " px" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166 msgid "Monospace &font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:168 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168 msgid "S&tandard font:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169 msgid "Serif" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170 msgid "Sans-serif" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:171 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:171 msgid "Monospace" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:172 msgid "Remember last used &window size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:174 msgid "Maximum &view width:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175 msgid "H&yphenate (break line in the middle of large words)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176 msgid "The default language to use for hyphenation rules. If the book does not specify a language, this will be used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177 msgid "Default &language for hyphenation:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:178 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:178 msgid "&Resize images larger than the viewer window (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:179 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:179 msgid "&User stylesheet" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:180 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:180 msgid "&General" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:181 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:181 msgid "Double click to change a keyboard shortcut" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:182 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:182 msgid "&Keyboard shortcuts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53 msgid "No results found for:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35 msgid "Options to customize the ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:42 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:687 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:687 msgid "Remember last used window size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:44 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:81 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81 msgid "Set the user CSS stylesheet. This can be used to customize the look of all books." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46 msgid "Maximum width of the viewer window, in pixels." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48 msgid "Resize images larger than the viewer window to fit inside it" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:49 msgid "Hyphenate text" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51 msgid "Default language for hyphenation rules" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53 msgid "Font options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55 msgid "The serif font family" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57 msgid "The sans-serif font family" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59 msgid "The monospaced font family" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60 msgid "The standard font size in px" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61 msgid "The monospaced font size in px" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62 msgid "The standard font type" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:453 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:453 msgid "&Lookup in dictionary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:456 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:456 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138 msgid "Go to..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468 msgid "Next Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:469 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:469 msgid "Previous Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471 msgid "Document Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:472 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:472 msgid "Document End" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474 msgid "Section Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:475 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:475 msgid "Section End" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12 msgid "Scroll to the next page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15 msgid "Scroll to the previous page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18 msgid "Scroll to the next section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21 msgid "Scroll to the previous section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24 msgid "Scroll to the bottom of the section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27 msgid "Scroll to the top of the section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30 msgid "Scroll to the end of the document" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33 msgid "Scroll to the start of the document" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36 msgid "Scroll down" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39 msgid "Scroll up" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42 msgid "Scroll left" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45 msgid "Scroll right" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115 msgid "Book format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:186 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:186 msgid "Position in book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:193 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:193 msgid "Go to a reference. To get reference numbers, use the reference mode." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:201 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:201 msgid "Search for text in book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:270 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:270 msgid "Print Preview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:301 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:301 msgid "Connecting to dict.org to lookup: <b>%s</b>…" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:400 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:400 msgid "Choose ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:401 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:401 msgid "Ebooks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:434 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:434 msgid "No matches found for: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:471 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:471 msgid "Loading flow..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:507 msgid "Laying out %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:538 msgid "Bookmark #%d" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:542 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:542 msgid "Add bookmark" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543 msgid "Enter title for bookmark:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:553 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:553 msgid "Manage Bookmarks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:590 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:590 msgid "Loading ebook..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:598 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:598 msgid "DRM Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:599 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:599 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:603 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:603 msgid "Could not open ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:677 msgid "Options to control the ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:684 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:684 msgid "If specified, viewer window will try to come to the front when started." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:689 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:689 msgid "Print javascript alert and console messages to the console" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:695 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:695 msgid "" "%prog [options] file\n" "\n" "View an ebook.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189 msgid "E-book Viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190 msgid "Close dictionary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192 msgid "toolBar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195 msgid "Next page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196 msgid "Previous page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197 msgid "Font size larger" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198 msgid "Font size smaller" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202 msgid "Find next" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203 msgid "Find next occurrence" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204 msgid "F3" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205 msgid "Copy to clipboard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207 msgid "Reference Mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208 msgid "Bookmark" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:209 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:209 msgid "Toggle full screen" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:210 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:210 msgid "Print" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:211 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:211 msgid "Find previous" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:212 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:212 msgid "Find previous occurrence" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:213 msgid "Shift+F3" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114 msgid "Print eBook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:257 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:257 msgid "Copy Image" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:258 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:258 msgid "Paste Image" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:383 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:383 msgid "Change Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:386 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:386 msgid "Swap Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:857 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:857 msgid "Drag to resize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:892 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:892 msgid "Show" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:899 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:899 msgid "Hide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:936 +#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:936 msgid "Toggle" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:370 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:370 msgid "If you use the WordPlayer e-book app on your Android phone, you can access your calibre book collection directly on the device. To do this you have to turn on the content server." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:374 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:374 msgid "Remember to leave calibre running as the server only runs as long as calibre is running." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:376 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:376 msgid "You have to add the URL http://myhostname:8080 as your calibre library in WordPlayer. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:453 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:453 msgid "Moving library..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:469 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:470 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:469 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:470 msgid "Failed to move library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:524 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:524 msgid "Invalid database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:525 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:525 msgid "<p>An invalid library already exists at %s, delete it before trying to move the existing library.<br>Error: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:536 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:536 msgid "Could not move library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:590 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:607 msgid "Select location for books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:665 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:621 +msgid "You must choose an empty folder for the calibre library. %s is not empty." +msgstr "" + +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:695 msgid "welcome wizard" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:54 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:42 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:42 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:50 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42 msgid "Welcome to calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:43 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:43 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:51 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43 msgid "The one stop solution to all your e-book needs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:56 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:56 msgid "Choose your book reader. This will set the conversion options to produce books optimized for your device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:57 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:57 msgid "&Manufacturers" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:58 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:58 msgid "&Devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:44 msgid "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s button to apply your settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45 msgid "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are available <a href=\"http://calibre-ebook.com/demo\">online</a>." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:46 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46 msgid "<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-ebook.com/user_manual\">online</a>." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:44 msgid "<p>calibre can automatically send books by email to your Kindle. To do that you have to setup email delivery below. The easiest way is to setup a free <a href=\"http://gmail.com\">gmail account</a> and click the Use gmail button below. You will also have to register your gmail address in your Amazon account." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45 msgid "&Kindle email:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52 msgid "Choose your &language:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:53 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53 msgid "Choose a location for your books. When you add books to calibre, they will be copied here:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:54 msgid "&Change" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:55 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55 msgid "If you have an existing calibre library, it will be copied to the new location. If a calibre library already exists at the new location, calibre will switch to using it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:32 msgid "Using: %s:%s@%s:%s and %s encryption" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37 msgid "Sending..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42 msgid "Mail successfully sent" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:124 msgid "Finish gmail setup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:125 msgid "Dont forget to enter your gmail username and password. You can sign up for a free gmail account at http://gmail.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:133 -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:140 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:133 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:140 msgid "Bad configuration" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:134 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:134 msgid "You must set the From email address" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:141 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:141 msgid "You must set the username and password for the mail server." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:108 msgid "Send email &from:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:109 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109 msgid "<p>This is what will be present in the From: field of emails sent by calibre.<br> Set it to your email address" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:110 msgid "<p>A mail server is useful if the service you are sending mail to only accepts email from well know mail services." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:111 msgid "Mail &Server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:112 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112 msgid "calibre can <b>optionally</b> use a server to send mail" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113 msgid "&Hostname:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114 msgid "The hostname of your mail server. For e.g. smtp.gmail.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115 msgid "&Port:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:116 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116 msgid "The port your mail server listens for connections on. The default is 25" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118 msgid "Your username on the mail server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120 msgid "Your password on the mail server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121 msgid "&Show" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122 msgid "&Encryption:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:123 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123 msgid "Use TLS encryption when connecting to the mail server. This is the most common." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124 msgid "&TLS" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125 msgid "Use SSL encryption when connecting to the mail server." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126 msgid "&SSL" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127 msgid "Use Gmail" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128 msgid "&Test email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:44 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44 msgid "<p>If you use the <a href=\"http://www.lexcycle.com/download\">Stanza</a> e-book app on your iPhone/iTouch, you can access your calibre book collection directly on the device. To do this you have to turn on the calibre content server." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45 +#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45 msgid "Turn on the &content server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:234 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:234 msgid "today" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:237 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:237 msgid "yesterday" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:240 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:240 msgid "thismonth" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:243 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:244 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:243 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:244 msgid "daysago" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:408 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:418 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:408 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:418 msgid "no" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:408 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:418 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:408 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:418 msgid "unchecked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:411 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:421 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:411 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:421 msgid "checked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:411 -#: /home/kovid/work/calibre/src/calibre/library/caches.py:421 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:411 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:421 msgid "yes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:415 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:415 msgid "blank" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/caches.py:415 +#: /home/kovid/work/trunk/src/calibre/library/caches.py:415 msgid "empty" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:48 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:48 msgid "" "The fields to output when cataloging books in the database. Should be a comma-separated list of fields.\n" "Available fields: %s.\n" @@ -9088,7 +9093,7 @@ msgid "" "Applies to: CSV, XML output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:58 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:58 msgid "" "Output field to sort on.\n" "Available fields: author_sort, id, rating, size, timestamp, title.\n" @@ -9096,7 +9101,7 @@ msgid "" "Applies to: CSV, XML output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:212 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:212 msgid "" "The fields to output when cataloging books in the database. Should be a comma-separated list of fields.\n" "Available fields: %s.\n" @@ -9104,7 +9109,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:222 msgid "" "Output field to sort on.\n" "Available fields: author_sort, id, rating, size, timestamp, title.\n" @@ -9112,7 +9117,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:231 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:231 msgid "" "Create a citation for BibTeX entries.\n" "Boolean value: True, False\n" @@ -9120,7 +9125,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:240 msgid "" "The template for citation creation from database fields.\n" " Should be a template with {} enclosed fields.\n" @@ -9129,7 +9134,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:250 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:250 msgid "" "BibTeX file encoding output.\n" "Available types: utf8, cp1252, ascii.\n" @@ -9137,7 +9142,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:259 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:259 msgid "" "BibTeX file encoding flag.\n" "Available types: strict, replace, ignore, backslashreplace.\n" @@ -9145,7 +9150,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:268 msgid "" "Entry type for BibTeX catalog.\n" "Available types: book, misc, mixed.\n" @@ -9153,28 +9158,28 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:536 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:536 msgid "" "Title of generated catalog used as title in metadata.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:543 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:543 msgid "" "Save the output from different stages of the conversion pipeline to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring.\n" "Default: '%default'None\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:553 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:553 msgid "" "Regex describing tags to exclude as genres.\n" "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:559 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:559 msgid "" "Comma-separated list of tag words indicating book should be excluded from output. Case-insensitive.\n" "--exclude-tags=skip will match 'skip this book' and 'Skip will like this'.\n" @@ -9182,35 +9187,35 @@ msgid "" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:567 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:567 msgid "" "Include 'Titles' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:574 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:574 msgid "" "Include 'Series' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:581 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:581 msgid "" "Include 'Recently Added' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:588 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:588 msgid "" "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:595 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:595 msgid "" "Sort titles with leading numbers as text, e.g.,\n" "'2001: A Space Odyssey' sorts as \n" @@ -9219,78 +9224,78 @@ msgid "" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:602 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:602 msgid "" "Specifies the output profile. In some cases, an output profile is required to optimize the catalog for the device. For example, 'kindle' or 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/catalog.py:609 +#: /home/kovid/work/trunk/src/calibre/library/catalog.py:609 msgid "" "Tag indicating book has been read.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:41 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:41 msgid "Path to the calibre library. Default is to use the path stored in the settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:120 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:120 msgid "" "%prog list [options]\n" "\n" "List the books available in the calibre database.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:128 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:128 msgid "" "The fields to display when listing books in the database. Should be a comma separated list of fields.\n" "Available fields: %s\n" "Default: %%default. The special field \"all\" can be used to select all fields. Only has effect in the text output format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:135 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:135 msgid "" "The field by which to sort the results.\n" "Available fields: %s\n" "Default: %%default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:137 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:137 msgid "Sort results in ascending order" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:139 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:139 msgid "Filter the results by the search query. For the format of the search query, please see the search related documentation in the User Manual. Default is to do no filtering." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:141 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:141 msgid "The maximum width of a single line in the output. Defaults to detecting screen size." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:142 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:142 msgid "The string used to separate fields. Default is a space." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:143 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:143 msgid "The prefix for all file paths. Default is the absolute path to the library folder." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:165 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:165 msgid "Invalid fields. Available fields:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:172 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:172 msgid "Invalid sort field. Available fields:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:244 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:244 msgid "The following books were not added as they already exist in the database (see --duplicates option):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:267 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:267 msgid "" "%prog add [options] file1 file2 file3 ...\n" "\n" @@ -9298,65 +9303,65 @@ msgid "" "the directory related options below.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:276 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:276 msgid "Assume that each directory has only a single logical book and that all files in it are different e-book formats of that book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:278 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:278 msgid "Process directories recursively" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:280 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:280 msgid "Add books to database even if they already exist. Comparison is done based on book titles." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:282 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:282 msgid "Add an empty book (a book with no formats)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:284 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:284 msgid "Set the title of the added empty book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:286 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:286 msgid "Set the authors of the added empty book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:288 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:288 msgid "Set the ISBN of the added empty book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:313 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:313 msgid "You must specify at least one file to add" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:330 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:330 msgid "" "%prog remove ids\n" "\n" "Remove the books identified by ids from the database. ids should be a comma separated list of id numbers (you can get id numbers by using the list command). For example, 23,34,57-85\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:345 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:345 msgid "You must specify at least one book to remove" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:364 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:364 msgid "" "%prog add_format [options] id ebook_file\n" "\n" "Add the ebook in ebook_file to the available formats for the logical book identified by id. You can get id by using the list command. If the format already exists, it is replaced.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:379 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:379 msgid "You must specify an id and an ebook file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:384 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:384 msgid "ebook file must have an extension" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:392 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:392 msgid "" "\n" "%prog remove_format [options] id fmt\n" @@ -9364,11 +9369,11 @@ msgid "" "Remove the format fmt from the logical book identified by id. You can get id by using the list command. fmt should be a file extension like LRF or TXT or EPUB. If the logical book does not have fmt available, do nothing.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:409 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:409 msgid "You must specify an id and a format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:427 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:427 msgid "" "\n" "%prog show_metadata [options] id\n" @@ -9377,15 +9382,15 @@ msgid "" "id is an id number from the list command.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:435 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:435 msgid "Print metadata in OPF form (XML)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:444 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:444 msgid "You must specify an id" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:458 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:458 msgid "" "\n" "%prog set_metadata [options] id /path/to/metadata.opf\n" @@ -9396,11 +9401,11 @@ msgid "" "show_metadata command.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:474 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:474 msgid "You must specify an id and a metadata file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:494 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:494 msgid "" "%prog export [options] ids\n" "\n" @@ -9409,27 +9414,27 @@ msgid "" "an opf file). You can get id numbers from the list command.\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:502 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:502 msgid "Export all books in database, ignoring the list of ids." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:504 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:504 msgid "Export books to the specified directory. Default is" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:506 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:506 msgid "Export all books into a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:513 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:513 msgid "Specifying this switch will turn this behavior off." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:536 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:536 msgid "You must specify some ids or the %s option" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:549 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:549 msgid "" "%prog add_custom_column [options] label name datatype\n" "\n" @@ -9438,19 +9443,19 @@ msgid "" "datatype is one of: {0}\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:558 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:558 msgid "This column stores tag like data (i.e. multiple comma separated values). Only applies if datatype is text." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:562 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:562 msgid "A dictionary of options to customize how the data in this column will be interpreted." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:575 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:575 msgid "You must specify label, name and datatype" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:636 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:636 msgid "" "\n" " %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n" @@ -9460,29 +9465,29 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:650 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:650 msgid "" "Comma-separated list of database IDs to catalog.\n" "If declared, --search is ignored.\n" "Default: all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:654 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:654 msgid "" "Filter the results by the search query. For the format of the search query, please see the search-related documentation in the User Manual.\n" "Default: no filtering" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:660 -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:660 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:505 msgid "Show detailed output information. Useful for debugging" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:673 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:673 msgid "Error: You must specify a catalog output file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:722 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:722 msgid "" "\n" " %prog set_custom [options] column id value\n" @@ -9494,15 +9499,15 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:733 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:733 msgid "If the column stores multiple values, append the specified values to the existing ones, instead of replacing them." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:744 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:744 msgid "Error: You must specify a field name, id and value" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:763 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:763 msgid "" "\n" " %prog custom_columns [options]\n" @@ -9511,19 +9516,19 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:770 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:770 msgid "Show details for each column." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:782 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:782 msgid "You will lose all data in the column: %r. Are you sure (y/n)? " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:784 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:784 msgid "y" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:790 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:790 msgid "" "\n" " %prog remove_custom_column [options] label\n" @@ -9533,15 +9538,15 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:798 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:798 msgid "Do not ask for confirmation" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:808 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:808 msgid "Error: You must specify a column label" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:818 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:818 msgid "" "\n" " %prog saved_searches [options] list\n" @@ -9554,39 +9559,39 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:836 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:836 msgid "Error: You must specify an action (add|remove|list)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:844 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:844 msgid "Name:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:845 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:845 msgid "Search string:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:851 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:851 msgid "Error: You must specify a name and a search string" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:854 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:854 msgid "added" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:859 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:859 msgid "Error: You must specify a name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:862 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:862 msgid "removed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:866 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:866 msgid "Error: Action %s not recognized, must be one of: (add|remove|list)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/cli.py:880 +#: /home/kovid/work/trunk/src/calibre/library/cli.py:880 msgid "" "%%prog command [options] [arguments]\n" "\n" @@ -9598,622 +9603,622 @@ msgid "" "For help on an individual command: %%prog command --help\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:537 +#: /home/kovid/work/trunk/src/calibre/library/custom_columns.py:537 msgid "No label was provided" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:539 +#: /home/kovid/work/trunk/src/calibre/library/custom_columns.py:539 msgid "The label must contain only lower case letters, digits and underscores, and start with a letter" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:71 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:71 msgid "%sAverage rating is %3.1f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:653 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:653 msgid "Main" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1998 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2004 msgid "<p>Migrating old database to ebook library in %s<br><center>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2027 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2033 msgid "Copying <b>%s</b>" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2044 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2050 msgid "Compacting database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2137 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2143 msgid "Checking SQL integrity..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2176 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2182 msgid "Checking for missing files." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2198 +#: /home/kovid/work/trunk/src/calibre/library/database2.py:2204 msgid "Checked id" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124 +#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:124 msgid "Ratings" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:24 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24 msgid "The title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:25 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25 msgid "The authors" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:26 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26 msgid "The author sort string. To use only the first letter of the name use {author_sort[0]}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:28 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:28 msgid "The tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29 msgid "The series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30 msgid "The series number. To get leading zeros use {series_index:0>3s} or {series_index:>3s} for leading spaces" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:33 msgid "The rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:34 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34 msgid "The ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35 msgid "The publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36 msgid "The date" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37 msgid "The published date" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:38 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38 msgid "The calibre internal id" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:48 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48 msgid "Options to control saving to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:54 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54 msgid "Normally, calibre will update the metadata in the saved files from what is in the calibre library. Makes saving to disk slower." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:57 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:57 msgid "Normally, calibre will write the metadata into a separate OPF file along with the actual e-book files." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:60 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:60 msgid "Normally, calibre will save the cover in a separate file along with the actual e-book file(s)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:63 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:63 msgid "Comma separated list of formats to save for each book. By default all available formats are saved." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:66 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:66 msgid "The template to control the filename and directory structure of the saved files. Default is \"%s\" which will save books into a per-author subdirectory with filenames containing title and author. Available controls are: {%s}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:71 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71 msgid "The template to control the filename and directory structure of files sent to the device. Default is \"%s\" which will save books into a per-author directory with filenames containing title and author. Available controls are: {%s}" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78 msgid "Normally, calibre will convert all non English characters into English equivalents for the file names. WARNING: If you turn this off, you may experience errors when saving, depending on how well the filesystem you are saving to supports unicode." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:84 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84 msgid "The format in which to display dates. %d - day, %b - month, %Y - year. Default is: %b, %Y" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:87 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:87 msgid "Convert paths to lowercase." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:89 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89 msgid "Replace whitespace with underscores." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:263 +#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:263 msgid "Requested formats not available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:21 msgid "Settings to control the calibre content server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:25 msgid "The port on which to listen. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:27 msgid "The server timeout in seconds. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:29 msgid "The max number of worker threads to use. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:31 msgid "Set a password to restrict access. By default access is unrestricted." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:33 msgid "Username for access. By default, it is: %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:37 msgid "The maximum size for displayed covers. Default is %default." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:39 msgid "The maximum number of matches to return per OPDS query. This affects Stanza, WordPlayer, etc. integration." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43 +#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:43 msgid "Group items in categories such as author/tags by first letter when there are more than this number of items. Default: %default. Set to a large number to disable grouping." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/base.py:94 +#: /home/kovid/work/trunk/src/calibre/library/server/base.py:94 msgid "Password to access your calibre library. Username is " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28 +#: /home/kovid/work/trunk/src/calibre/library/server/main.py:28 msgid "" "[options]\n" "\n" "Start the calibre content server." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30 +#: /home/kovid/work/trunk/src/calibre/library/server/main.py:30 msgid "Path to the library folder to serve with the content server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32 +#: /home/kovid/work/trunk/src/calibre/library/server/main.py:32 msgid "Write process PID to the specified file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/main.py:36 +#: /home/kovid/work/trunk/src/calibre/library/server/main.py:36 msgid "Specifies a restriction to be used for this invocation. This option overrides any per-library settings specified in the GUI" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:111 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:111 msgid "%d book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:130 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:130 msgid "%d items" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:147 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:147 msgid "RATING: %s<br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:150 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:150 msgid "TAGS: %s<br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:154 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:154 msgid "SERIES: %s [%s]<br />" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:249 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:249 msgid "Books in your library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:255 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:255 msgid "By " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:256 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:256 msgid "Books sorted by " msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:588 +#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:588 msgid "Newest" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:32 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:32 msgid "" "%sUsage%s: %s\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:76 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:76 msgid "Created by " msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:77 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:77 msgid "Whenever you pass arguments to %prog that have spaces in them, enclose the arguments in quotation marks." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:697 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:697 msgid "Path to the database in which books are stored" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:699 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:699 msgid "Pattern to guess metadata from filenames" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:701 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:701 msgid "Access key for isbndb.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:703 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:703 msgid "Default timeout for network operations (seconds)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:705 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:705 msgid "Path to directory in which your library of books is stored" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:707 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:707 msgid "The language in which to display the user interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:709 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:709 msgid "The default output format for ebook conversions." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:713 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:713 msgid "Ordered list of formats to prefer for input." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:715 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:715 msgid "Read metadata from files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:717 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:717 msgid "The priority of worker processes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:719 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:719 msgid "Swap author first and last names when reading metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:721 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:721 msgid "Add new formats to existing book records" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:723 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:723 msgid "Tags to apply to books added to the library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:727 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:727 msgid "List of named saved searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:728 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:728 msgid "User-created tag browser categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/config.py:730 +#: /home/kovid/work/trunk/src/calibre/utils/config.py:730 msgid "How and when calibre updates metadata on the device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:43 msgid "Waiting..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:52 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:52 msgid "Stopped" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:54 msgid "Finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:76 +#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:76 msgid "Working..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95 msgid "Brazilian Portuguese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96 msgid "English (UK)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97 msgid "Simplified Chinese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98 msgid "Chinese (HK)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99 msgid "Traditional Chinese" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100 msgid "English" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101 msgid "English (Australia)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102 msgid "English (New Zealand)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103 msgid "English (Canada)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104 msgid "English (India)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105 msgid "English (Thailand)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106 msgid "English (Cyprus)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107 msgid "English (Pakistan)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108 msgid "English (Israel)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109 msgid "English (Singapore)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110 msgid "English (Yemen)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111 msgid "English (Ireland)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112 msgid "English (China)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113 msgid "Spanish (Paraguay)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114 msgid "German (AT)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:115 msgid "Dutch (NL)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/localization.py:116 +#: /home/kovid/work/trunk/src/calibre/utils/localization.py:116 msgid "Dutch (BE)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53 +#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53 msgid "URL must have the scheme sftp" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57 +#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57 msgid "host must be of the form user@hostname" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68 +#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68 msgid "Failed to negotiate SSH session: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71 +#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71 msgid "Failed to authenticate with server: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:230 +#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:230 msgid "Control email delivery" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118 +#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:118 msgid "Unknown section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140 +#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:140 msgid "Unknown feed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158 -#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:185 +#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:158 +#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:185 msgid "Untitled article" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:22 +#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:22 msgid "Download periodical content from the internet" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:37 +#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:37 msgid "Useful for recipe development. Forces max_articles_per_feed to 2 and downloads at most 2 feeds." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:40 +#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:40 msgid "Username for sites that require a login to access content." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:43 +#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:43 msgid "Password for sites that require a login to access content." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:47 +#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:47 msgid "Do not download latest version of builtin recipes from the calibre server" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:47 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:47 msgid "Unknown News Source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:612 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:612 msgid "The \"%s\" recipe needs a username and password." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:711 msgid "Download finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:713 msgid "Failed to download the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:719 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:719 msgid "Failed to download parts of the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:721 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:721 msgid " from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:723 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:723 msgid "\tFailed links:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:812 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:812 msgid "Could not fetch article. Run with -vv to see the reason" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:833 msgid "Fetching feeds..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:838 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:838 msgid "Got feeds from index page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:844 msgid "Trying to download cover..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:846 msgid "Generating masthead..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:927 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:927 msgid "Starting download [%d thread(s)]..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:943 msgid "Feeds downloaded to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:952 msgid "Could not download cover: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:959 msgid "Downloading cover from %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1004 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1004 msgid "Masthead image downloaded" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1172 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1172 msgid "Untitled Article" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1243 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1243 msgid "Article downloaded: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1254 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1254 msgid "Article download failed: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1271 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1271 msgid "Fetching feed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1418 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1418 msgid "Failed to log in, check your username and password for the calibre Periodicals service." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1433 +#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1433 msgid "You do not have permission to download this issue. Either your subscription has expired or you have exceeded the maximum allowed downloads for today." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47 msgid "You" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:193 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:193 msgid "Scheduled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84 -#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:194 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:84 +#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:194 msgid "Custom" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:482 msgid "" "%prog URL\n" "\n" "Where URL is for example http://google.com" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485 msgid "Base directory into which URL is saved. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:488 msgid "Timeout in seconds to wait for a response from the server. Default: %default s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:491 msgid "Maximum number of levels to recurse i.e. depth of links to follow. Default %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:494 msgid "The maximum number of files to download. This only applies to files from <a href> tags. Default is %default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:496 msgid "Minimum interval in seconds between consecutive fetches. Default is %default s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:498 msgid "The character encoding for the websites you are trying to download. The default is to try and guess the encoding." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:500 msgid "Only links that match this regular expression will be followed. This option can be specified multiple times, in which case as long as a link matches any one regexp, it will be followed. By default all links are followed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:502 msgid "Any link that matches this regular expression will be ignored. This option can be specified multiple times, in which case as long as any regexp matches a link, it will be ignored.By default, no links are ignored. If both --filter-regexp and --match-regexp are specified, then --filter-regexp is applied first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504 +#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:504 msgid "Do not download CSS stylesheets." msgstr "" From f2e0b501440e3034740904f6e91e8765dea30ff0 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 21:48:40 +0100 Subject: [PATCH 192/235] Fix search/replace --- src/calibre/gui2/dialogs/metadata_bulk.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 347ed36d7c..6b41434347 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -169,7 +169,6 @@ class MyBlockingBusy(QDialog): self.current_index = len(self.ids) elif self.current_phase == 4: self.s_r_func(id) - self.current_index = len(self.ids) # do the next one self.current_index += 1 self.do_one_signal.emit() From 66d958241060b59ed95088c60c2bfb1bac474a24 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 14:57:26 -0600 Subject: [PATCH 193/235] Rmf24 - Opinie by Tomasz Dlugosz --- resources/recipes/rmf24_opinie.recipe | 55 +++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 resources/recipes/rmf24_opinie.recipe diff --git a/resources/recipes/rmf24_opinie.recipe b/resources/recipes/rmf24_opinie.recipe new file mode 100644 index 0000000000..4d2f447dbe --- /dev/null +++ b/resources/recipes/rmf24_opinie.recipe @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = u'2010, Tomasz Dlugosz <tomek3d@gmail.com>' +''' +rmf24.pl +''' + +import re +from calibre.web.feeds.news import BasicNewsRecipe + +class RMF24_opinie(BasicNewsRecipe): + title = u'Rmf24.pl - Opinie' + description = u'Blogi, wywiady i komentarze ze strony rmf24.pl' + language = 'pl' + oldest_article = 7 + max_articles_per_feed = 100 + __author__ = u'Tomasz D\u0142ugosz' + no_stylesheets = True + remove_javascript = True + + feeds = [(u'Blogi', u'http://www.rmf24.pl/opinie/blogi/feed'), + (u'Kontrwywiad', u'http://www.rmf24.pl/opinie/wywiady/kontrwywiad/feed'), + (u'Przes\u0142uchanie', u'http://www.rmf24.pl/opinie/wywiady/przesluchanie/feed'), + (u'Komentarze', u'http://www.rmf24.pl/opinie/komentarze/feed')] + + keep_only_tags = [ + dict(name='div', attrs={'class':'box articleSingle print'}), + dict(name='div', attrs={'class':'box articleSingle print singleCommentary'}), + dict(name='div', attrs={'class':'box articleSingle print blogSingleEntry'})] + + remove_tags = [ + dict(name='div', attrs={'class':'toTop'}), + dict(name='div', attrs={'class':'category'}), + dict(name='div', attrs={'class':'REMOVE'}), + dict(name='div', attrs={'class':'embed embedAd'})] + + extra_css = ''' + h1 { font-size: 1.2em; } + ''' + + # thanks to Kovid Goyal + def get_article_url(self, article): + link = article.get('link') + if 'audio' not in link: + return link + + preprocess_regexps = [ + (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in + [ + (r'<h2>Zdj.cie</h2>', lambda match: ''), + (r'embed embed(Left|Right|Center) articleEmbed(Audio|Wideo articleEmbedVideo|ArticleFull|ArticleTitle|ArticleListTitle|AlbumHorizontal)">', lambda match: 'REMOVE">'), + (r'<a href="http://www.facebook.com/pages/RMF24pl/.*?>RMF24.pl</a> on Facebook</div>', lambda match: '</div>') + ] + ] From 57b6d6c0d1ed553dd25a4758b95b6ba0b29cf065 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 15:28:11 -0600 Subject: [PATCH 194/235] Change plugboard image to an icon instead of an image --- imgsrc/plugboard.svg | 7257 +++++++++++++++++++++++++++ resources/images/plugboard.png | Bin 31806 -> 3694 bytes resources/recipes/popscience.recipe | 1 - 3 files changed, 7257 insertions(+), 1 deletion(-) create mode 100644 imgsrc/plugboard.svg diff --git a/imgsrc/plugboard.svg b/imgsrc/plugboard.svg new file mode 100644 index 0000000000..9aa0996193 --- /dev/null +++ b/imgsrc/plugboard.svg @@ -0,0 +1,7257 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="128" + height="128" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.48.0 r9654" + version="1.0" + sodipodi:docname="plugboard.svg" + inkscape:output_extension="org.inkscape.output.svgz.inkscape" + inkscape:export-filename="/home/kovid/work/custom/resources/images/plugboard.png" + inkscape:export-xdpi="33.75" + inkscape:export-ydpi="33.75"> + <defs + id="defs4"> + <linearGradient + id="linearGradient3487"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop3489" /> + <stop + id="stop3491" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0" + offset="1" + id="stop3493" /> + </linearGradient> + <linearGradient + id="linearGradient3463"> + <stop + id="stop3465" + offset="0" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0.60000002" + id="stop3467" /> + <stop + id="stop3469" + offset="1" + style="stop-color:#000000;stop-opacity:0" /> + </linearGradient> + <linearGradient + id="linearGradient3397"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop3399" /> + <stop + id="stop3459" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0" + offset="1" + id="stop3401" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="6.1230318e-14 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + <radialGradient + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.3744819,0,0,1.1757664,-151.96684,-17.48331)" + r="28" + fy="44.202766" + fx="64" + cy="44.202766" + cx="64" + id="radialGradient3154" + xlink:href="#linearGradient3283" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.9253496,0,0,1.7548297,-59.222375,-41.365268)" + r="32" + fy="60.100002" + fx="64" + cy="60.100002" + cx="64" + id="radialGradient3148" + xlink:href="#linearGradient3291" + inkscape:collect="always" /> + <radialGradient + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4816064,0,0,2.7355372,-126.87532,-60.950005)" + r="22" + fy="44" + fx="46" + cy="44" + cx="46" + id="radialGradient3297" + xlink:href="#linearGradient3291" + inkscape:collect="always" /> + <radialGradient + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.5117052,0,0,2.2794231,-299.73902,-15.940307)" + r="18" + fy="26.616402" + fx="45.310146" + cy="26.616402" + cx="45.310146" + id="radialGradient3289" + xlink:href="#linearGradient3283" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(2.2279695,0,0,1.9948165,-36.751288,-17.216948)" + spreadMethod="pad" + gradientUnits="userSpaceOnUse" + y2="16.733448" + x2="28" + y1="66.467087" + x1="28" + id="linearGradient3192" + xlink:href="#linearGradient3186" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3186" + inkscape:collect="always"> + <stop + id="stop3188" + offset="0" + style="stop-color:#c8c8c8;stop-opacity:1" /> + <stop + id="stop3190" + offset="1" + style="stop-color:#e4e4e4;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3283" + inkscape:collect="always"> + <stop + id="stop3285" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3287" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3291"> + <stop + id="stop3293" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3295" + offset="1" + style="stop-color:#7c7c7c;stop-opacity:1;" /> + </linearGradient> + <inkscape:perspective + id="perspective2409" + inkscape:persp3d-origin="64 : 42.666667 : 1" + inkscape:vp_z="128 : 64 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 64 : 1" + sodipodi:type="inkscape:persp3d" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient3208" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.3744819,0,0,1.1757664,-11.96684,-17.583312)" + spreadMethod="reflect" + cx="64" + cy="44.202766" + fx="64" + fy="44.202766" + r="28" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient3211" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.2279695,0,0,1.9948165,83.248712,-17.31695)" + spreadMethod="pad" + x1="28" + y1="66.467087" + x2="28" + y2="16.733448" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="radialGradient3214" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.9253496,0,0,1.7548297,60.777625,-41.46527)" + cx="64" + cy="60.100002" + fx="64" + fy="60.100002" + r="32" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient3216" + x1="64" + y1="100" + x2="64" + y2="28" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1428572,0,0,1,-7.1428578,0)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient3222" + cx="64" + cy="54.400002" + fx="64" + fy="54.400002" + r="16" + gradientTransform="matrix(7.7142861,0,0,1.7500001,-427.71431,-43.200007)" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" /> + <filter + inkscape:collect="always" + id="filter3238"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.36" + id="feGaussianBlur3240" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="linearGradient3244" + x1="70" + y1="127" + x2="70" + y2="32.952141" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient3248" + x1="64" + y1="24" + x2="64" + y2="-52" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient3254" + cx="66" + cy="-10.851176" + fx="66" + fy="-10.851176" + r="2" + gradientTransform="matrix(23,-1e-6,6.1024648e-7,14.035669,-1452,156.4281)" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="linearGradient3258" + x1="64" + y1="83.729706" + x2="64" + y2="-62.169582" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + id="filter3272" + x="-0.174" + width="1.348" + y="-0.02784" + height="1.05568"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.16" + id="feGaussianBlur3274" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="linearGradient3340" + gradientUnits="userSpaceOnUse" + x1="64" + y1="83.729706" + x2="64" + y2="-62.169582" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient3342" + gradientUnits="userSpaceOnUse" + x1="64" + y1="24" + x2="64" + y2="-52" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient3344" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(23,-1e-6,6.1024648e-7,14.035669,-1452,156.4281)" + spreadMethod="reflect" + cx="66" + cy="-10.851176" + fx="66" + fy="-10.851176" + r="2" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="linearGradient3357" + gradientUnits="userSpaceOnUse" + x1="70" + y1="127" + x2="70" + y2="32.952141" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient3359" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1428572,0,0,1,-7.1428578,0)" + x1="64" + y1="100" + x2="64" + y2="28" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient3361" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(7.7142861,0,0,1.7500001,-427.71431,-43.200007)" + spreadMethod="reflect" + cx="64" + cy="54.400002" + fx="64" + fy="54.400002" + r="16" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3397" + id="radialGradient3403" + cx="64" + cy="64" + fx="64" + fy="64" + r="64" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4225932,0,0,1.4225932,-27.045963,-27.045963)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3463" + id="radialGradient3461" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4225932,0,0,1.4225932,-27.045963,-27.045963)" + cx="64" + cy="64" + fx="64" + fy="64" + r="64" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3463" + id="radialGradient3477" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7782415,0,0,1.7782415,-49.807454,-49.807454)" + cx="64" + cy="64" + fx="64" + fy="64" + r="64" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3487" + id="radialGradient3485" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7782415,0,0,1.7782415,-49.807454,-49.807454)" + cx="64" + cy="64" + fx="64" + fy="64" + r="64" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3487" + id="radialGradient3499" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7782416,0,0,1.7782416,-23.883571,-115.22167)" + cx="64" + cy="64" + fx="64" + fy="64" + r="64" /> + <mask + maskUnits="userSpaceOnUse" + id="mask3495"> + <rect + style="opacity:0.6;fill:url(#radialGradient3499);fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3497" + width="160" + height="160" + x="9.9238844" + y="-81.414215" + transform="matrix(0.7071068,0.7071067,-0.7071067,0.7071068,0,0)" /> + </mask> + <radialGradient + r="16.25" + fy="433.70554" + fx="311.27777" + cy="431.38034" + cx="312" + gradientTransform="matrix(0.696437,0,0,1.188967,1.10853,-411.55486)" + gradientUnits="userSpaceOnUse" + id="radialGradient4500" + xlink:href="#linearGradient3654" + inkscape:collect="always" /> + <radialGradient + r="16.25" + fy="433.70554" + fx="311.27777" + cy="431.38034" + cx="312" + gradientTransform="matrix(-0.696437,0,0,1.188967,461.84022,-411.55486)" + gradientUnits="userSpaceOnUse" + id="radialGradient4497" + xlink:href="#linearGradient3654" + inkscape:collect="always" /> + <radialGradient + r="22.444886" + fy="392.75388" + fx="330.04404" + cy="396.09259" + cx="324.39757" + gradientTransform="matrix(1.0059645,0,0,1.4472234,-95.24398,-507.86463)" + gradientUnits="userSpaceOnUse" + id="radialGradient4493" + xlink:href="#linearGradient3149" + inkscape:collect="always" /> + <radialGradient + r="22.779817" + fy="369.61789" + fx="332.49338" + cy="369.61789" + cx="332.49338" + gradientTransform="matrix(-0.7020433,-0.1106778,8.3859807e-2,-0.5312371,441.44118,274.73245)" + gradientUnits="userSpaceOnUse" + id="radialGradient4484" + xlink:href="#linearGradient3368" + inkscape:collect="always" /> + <linearGradient + y2="426.80276" + x2="325.29688" + y1="481.87405" + x1="325.29688" + gradientTransform="matrix(1.0059645,0,0,1.0053055,-95.46406,-332.79275)" + gradientUnits="userSpaceOnUse" + id="linearGradient4477" + xlink:href="#linearGradient3397" + inkscape:collect="always" /> + <linearGradient + y2="104.80668" + x2="-62.424866" + y1="76.708466" + x1="-13.757333" + gradientTransform="translate(144.36675,15.9547)" + gradientUnits="userSpaceOnUse" + id="linearGradient4464" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + r="24" + fy="100" + fx="-60" + cy="84" + cx="-44" + gradientTransform="translate(144.36675,15.9547)" + gradientUnits="userSpaceOnUse" + id="radialGradient4455" + xlink:href="#linearGradient3030" + inkscape:collect="always" /> + <radialGradient + r="20" + fy="96" + fx="-40" + cy="84" + cx="-44" + gradientTransform="translate(144.36675,15.9547)" + gradientUnits="userSpaceOnUse" + id="radialGradient4451" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + y2="108.0104" + x2="11.68106" + y1="60.539303" + x1="11.68106" + gradientTransform="translate(81.679251,15.9547)" + gradientUnits="userSpaceOnUse" + id="linearGradient4448" + xlink:href="#linearGradient3272" + inkscape:collect="always" /> + <linearGradient + y2="96.001434" + x2="11.68106" + y1="52" + x1="6.6976352" + gradientTransform="translate(81.669111,15.9547)" + gradientUnits="userSpaceOnUse" + id="linearGradient4445" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="72" + x2="14.697635" + y1="96" + x1="26.697636" + gradientTransform="translate(81.669111,15.9547)" + gradientUnits="userSpaceOnUse" + id="linearGradient4442" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="84" + x2="120.25" + y1="84" + x1="79.75" + gradientTransform="translate(0.3667409,15.9547)" + gradientUnits="userSpaceOnUse" + id="linearGradient4439" + xlink:href="#linearGradient3225" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4426" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4422" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="18.50366" + x2="76.284438" + y1="18.50366" + x1="64.341991" + gradientTransform="scale(1.039383,0.9621093)" + gradientUnits="userSpaceOnUse" + id="linearGradient4420" + xlink:href="#linearGradient3207" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4418" + xlink:href="#linearGradient5412" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4416" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4414" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="463.13513" + x2="305.67725" + y1="444.45746" + x1="313.74829" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4410" + xlink:href="#linearGradient3586" + inkscape:collect="always" /> + <linearGradient + y2="463.13513" + x2="305.67725" + y1="444.45746" + x1="313.74829" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4408" + xlink:href="#linearGradient3578" + inkscape:collect="always" /> + <linearGradient + y2="441.53894" + x2="299.28384" + y1="482.53894" + x1="270.50647" + gradientUnits="userSpaceOnUse" + id="linearGradient4406" + xlink:href="#linearGradient3508" + inkscape:collect="always" /> + <linearGradient + y2="434.35086" + x2="290.62091" + y1="453.0892" + x1="315.72318" + gradientTransform="translate(58.5,26.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4404" + xlink:href="#linearGradient3343" + inkscape:collect="always" /> + <linearGradient + y2="434.35086" + x2="290.62091" + y1="453.0892" + x1="315.72318" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4402" + xlink:href="#linearGradient3343" + inkscape:collect="always" /> + <linearGradient + y2="429.73987" + x2="310.53195" + y1="476.40894" + x1="326" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4400" + xlink:href="#linearGradient4126" + inkscape:collect="always" /> + <linearGradient + y2="458.62648" + x2="461.90625" + y1="458.62646" + x1="414.41586" + gradientUnits="userSpaceOnUse" + id="linearGradient4398" + xlink:href="#linearGradient4067" + inkscape:collect="always" /> + <linearGradient + y2="443.03894" + x2="312.78384" + y1="463.03894" + x1="283.50647" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4396" + xlink:href="#linearGradient3516" + inkscape:collect="always" /> + <linearGradient + y2="214.96599" + x2="568.9887" + y1="214.96599" + x1="563.64667" + gradientTransform="matrix(0.5366445,0,0,1.8634309,-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4392" + xlink:href="#linearGradient3733" + inkscape:collect="always" /> + <linearGradient + y2="373.61218" + x2="339.76785" + y1="390.86218" + x1="353.44516" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4390" + xlink:href="#linearGradient3581" + inkscape:collect="always" /> + <linearGradient + y2="367.39182" + x2="320.36423" + y1="407.39011" + x1="330.09335" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4388" + xlink:href="#linearGradient3499" + inkscape:collect="always" /> + <linearGradient + y2="384.62384" + x2="345.62039" + y1="385.86126" + x1="304.88664" + gradientUnits="userSpaceOnUse" + id="linearGradient4386" + xlink:href="#linearGradient3489" + inkscape:collect="always" /> + <linearGradient + y2="370.57019" + x2="325.7691" + y1="398.85446" + x1="324.65039" + gradientUnits="userSpaceOnUse" + id="linearGradient4382" + xlink:href="#linearGradient3433" + inkscape:collect="always" /> + <radialGradient + r="0.79621875" + fy="397.17727" + fx="303.71943" + cy="397.17727" + cx="303.71943" + gradientTransform="matrix(1,0,0,2.5768702,-372.5,-950.79699)" + gradientUnits="userSpaceOnUse" + id="radialGradient4380" + xlink:href="#linearGradient3837" + inkscape:collect="always" /> + <radialGradient + r="0.79621875" + fy="397.17727" + fx="303.71943" + cy="397.17727" + cx="303.71943" + gradientTransform="matrix(1,0,0,2.5768702,43.133514,-626.29699)" + gradientUnits="userSpaceOnUse" + id="radialGradient4378" + xlink:href="#linearGradient3837" + inkscape:collect="always" /> + <linearGradient + y2="418.65884" + x2="331.42062" + y1="431.1243" + x1="317.01251" + gradientTransform="translate(-372.5,-324.5)" + gradientUnits="userSpaceOnUse" + id="linearGradient4376" + xlink:href="#linearGradient3329" + inkscape:collect="always" /> + <linearGradient + y2="422.63611" + x2="412.78592" + y1="400.84558" + x1="412.78592" + gradientUnits="userSpaceOnUse" + id="linearGradient4374" + xlink:href="#linearGradient3163" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3445"> + <stop + style="stop-color:#f9ede0;stop-opacity:1;" + offset="0" + id="stop3447" /> + <stop + id="stop3670" + offset="0.5" + style="stop-color:#f9ede0;stop-opacity:0.80575538;" /> + <stop + style="stop-color:#f9ede0;stop-opacity:0;" + offset="1" + id="stop3450" /> + </linearGradient> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3705"> + <path + sodipodi:nodetypes="cccccccc" + id="path3707" + d="M 341.25,409.625 C 339.73679,416.82736 335.50876,433.0214 340.75,436.875 C 340.10353,443.87478 333.6714,446.51892 325.75,448.0625 L 324.25,448.0625 C 316.3286,446.51892 309.89647,443.87478 309.25,436.875 C 314.49124,433.0214 310.26321,416.82736 308.75,409.625 L 325,417.03125 L 341.25,409.625 z " + style="opacity:0.74906365;fill:url(#radialGradient3709);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </clipPath> + <linearGradient + id="linearGradient3149"> + <stop + style="stop-color:#faf0e5;stop-opacity:1;" + offset="0" + id="stop3151" /> + <stop + id="stop10454" + offset="0.591133" + style="stop-color:#f7e7d6;stop-opacity:1;" /> + <stop + style="stop-color:#efcfac;stop-opacity:1;" + offset="1" + id="stop3153" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3279" + id="radialGradient3291" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.4395859,0.3535533,-174.66839)" + cx="412.43236" + cy="395.73904" + fx="412.43236" + fy="395.73904" + r="22.444886" /> + <mask + maskUnits="userSpaceOnUse" + id="mask3287"> + <path + style="opacity:1;fill:url(#radialGradient3291);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 412.56716,362.7206 C 404.7906,362.9256 395.78945,368.58113 392.66091,375.5331 C 389.47419,382.61431 389.9381,391.06936 391.84841,400.8456 C 393.75873,410.62183 400.03668,420.79216 403.22341,424.4706 C 406.24381,427.95705 410.11265,427.32692 412.56716,427.25185 C 412.69296,427.25185 412.8695,427.24772 413.00466,427.25185 C 415.45917,427.32692 419.32801,427.95705 422.34841,424.4706 C 425.53514,420.79216 431.81309,410.62183 433.72341,400.8456 C 435.63374,391.06936 436.09763,382.61431 432.91091,375.5331 C 429.78236,368.58113 420.78122,362.9256 413.00466,362.7206 L 412.56716,362.7206 z " + id="path3289" + sodipodi:nodetypes="csssssssscc" /> + </mask> + <linearGradient + inkscape:collect="always" + id="linearGradient3329"> + <stop + style="stop-color:#f9eee2;stop-opacity:1;" + offset="0" + id="stop3331" /> + <stop + style="stop-color:#f9eee2;stop-opacity:0;" + offset="1" + id="stop3333" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3837"> + <stop + style="stop-color:#f1e4d4;stop-opacity:1;" + offset="0" + id="stop3839" /> + <stop + style="stop-color:#f1e4d4;stop-opacity:0;" + offset="1" + id="stop3841" /> + </linearGradient> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3429"> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 303.70236,398.81874 L 303.52558,385.56049 L 306.17724,378.31265 L 311.48054,376.54488 L 319.96582,379.19653 L 327.39044,380.61074 L 334.63828,376.89843 L 339.94158,376.89843 L 343.65389,382.02496 L 345.59844,390.15668 L 345.42166,395.45998 L 345.77521,397.40453 L 337.99704,382.37851 L 328.4511,386.09082 L 321.55681,386.2676 L 311.12698,381.31785 L 303.70236,398.81874 z " + id="path3431" /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3433"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3435" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3437" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3433" + id="linearGradient3439" + x1="324.65039" + y1="398.85446" + x2="325.7691" + y2="370.57019" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3368"> + <stop + style="stop-color:#e5d3c3;stop-opacity:1;" + offset="0" + id="stop3370" /> + <stop + style="stop-color:#e5d3c3;stop-opacity:0;" + offset="1" + id="stop3372" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3489"> + <stop + style="stop-color:#765c44;stop-opacity:1;" + offset="0" + id="stop10422" /> + <stop + style="stop-color:#765c44;stop-opacity:0;" + offset="1" + id="stop10424" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3499"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3501" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3503" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3581"> + <stop + style="stop-color:#dfcbba;stop-opacity:1;" + offset="0" + id="stop3583" /> + <stop + style="stop-color:#dfcbba;stop-opacity:0;" + offset="1" + id="stop3585" /> + </linearGradient> + <linearGradient + id="linearGradient10403"> + <stop + style="stop-color:#f4f5f8;stop-opacity:1;" + offset="0" + id="stop10405" /> + <stop + style="stop-color:#fdfdfe;stop-opacity:1;" + offset="1" + id="stop10407" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3516"> + <stop + style="stop-color:#c8cddc;stop-opacity:1;" + offset="0" + id="stop3518" /> + <stop + style="stop-color:#c8cddc;stop-opacity:0;" + offset="1" + id="stop3520" /> + </linearGradient> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath4063"> + <path + style="fill:#f4f5f8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 410.16587,443.06739 C 399.92306,443.35352 396.79838,439.11371 395.91587,435.375 C 394.63808,435.58506 393.88204,436.60113 393.91587,437.375 C 386.83254,440.20988 378.26803,443.06735 370.66587,446.875 C 367.84405,448.28835 364.62926,452.59537 363.79087,454.875 C 361.23389,461.82756 358.41587,471.625 358.41587,471.625 L 359.91587,473.375 C 375.56063,482.28715 396.79503,481.875 410.16587,481.875 C 423.53671,481.875 444.77111,482.28715 460.41587,473.375 L 461.91587,471.625 C 461.91587,471.625 459.09785,461.82756 456.54087,454.875 C 455.70248,452.59537 452.48769,448.28835 449.66587,446.875 C 442.06371,443.06735 433.4992,440.20988 426.41587,437.375 C 426.4497,436.60113 425.69366,435.58506 424.41587,435.375 C 422.00224,439.11764 420.40868,442.78126 410.16587,443.06739 z " + id="path4065" + sodipodi:nodetypes="cccssccsccssccz" /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient4067"> + <stop + style="stop-color:#8d97b7;stop-opacity:1;" + offset="0" + id="stop4069" /> + <stop + style="stop-color:#8d97b7;stop-opacity:0;" + offset="1" + id="stop4071" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4067" + id="linearGradient4073" + x1="414.41586" + y1="458.62646" + x2="461.90625" + y2="458.62648" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + id="linearGradient4126"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop4128" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4130" /> + </linearGradient> + <filter + inkscape:collect="always" + x="-0.020813678" + width="1.0416274" + y="-0.13193184" + height="1.2638637" + id="filter3283"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.60896269" + id="feGaussianBlur3285" /> + </filter> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3289"> + <path + id="path3291" + d="M 463.75,435.375 C 462.47221,435.58506 461.71617,436.60113 461.75,437.375 C 461.67075,437.40672 460.87251,438.49769 460.79289,438.52941 C 462.04491,442.53121 465.95016,446.80149 477.54289,446.49816 C 489.04307,446.19726 493.45299,441.22873 494.71875,437.5625 C 494.5676,437.5025 494.39985,437.43497 494.25,437.375 C 494.28383,436.60113 493.52779,435.58506 492.25,435.375 C 489.83637,439.11764 488.24281,442.77637 478,443.0625 C 467.75719,443.34864 464.63251,439.11371 463.75,435.375 z M 459.125,438.40625 C 453.68198,440.50508 447.66707,442.67009 441.90625,445.28125 C 447.80188,443.05208 453.52791,442.11601 458.76072,440.15441 C 458.75013,439.92745 459.01107,438.6493 459.125,438.40625 z M 497.46875,438.625 C 497.52198,438.79302 497.56984,438.93659 497.5625,439.09375 C 501.77057,440.67121 506.39991,442.24968 511.125,443.96875 C 506.49146,442.00962 501.81994,440.29346 497.46875,438.625 z " + style="fill:#f4f5f8;fill-opacity:1;fill-rule:evenodd;stroke:#98a2bf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3283)" + sodipodi:nodetypes="cccscccsccccccccc" /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3343"> + <stop + style="stop-color:#bbc1d4;stop-opacity:1;" + offset="0" + id="stop3345" /> + <stop + style="stop-color:#bbc1d4;stop-opacity:0;" + offset="1" + id="stop3347" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3508"> + <stop + style="stop-color:#c8cddc;stop-opacity:1;" + offset="0" + id="stop3510" /> + <stop + style="stop-color:#c8cddc;stop-opacity:0;" + offset="1" + id="stop3512" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3586"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3588" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3590" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3578"> + <stop + style="stop-color:#c8cddc;stop-opacity:1;" + offset="0" + id="stop3580" /> + <stop + style="stop-color:#c8cddc;stop-opacity:0;" + offset="1" + id="stop3582" /> + </linearGradient> + <linearGradient + id="linearGradient10207"> + <stop + offset="0" + id="stop10209" + style="stop-color:#a2a2a2;stop-opacity:1;" /> + <stop + offset="1" + id="stop10211" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <radialGradient + id="radialGradient3563" + r="139.55859" + cx="102" + cy="112.3047" + gradientUnits="userSpaceOnUse"> + <stop + offset="0" + id="stop41" + style="stop-color:#b7b8b9;stop-opacity:1;" /> + <stop + offset="0.18851049" + id="stop47" + style="stop-color:#ECECEC" /> + <stop + offset="0.25718147" + id="stop49" + style="stop-color:#FAFAFA" /> + <stop + offset="0.30111277" + id="stop51" + style="stop-color:#FFFFFF" /> + <stop + offset="0.5313" + id="stop53" + style="stop-color:#FAFAFA" /> + <stop + offset="0.8449" + id="stop55" + style="stop-color:#EBECEC" /> + <stop + offset="1" + id="stop57" + style="stop-color:#E1E2E3" /> + </radialGradient> + <clipPath + id="clipPath7084" + clipPathUnits="userSpaceOnUse"> + <path + id="path7086" + d="M 72,88 L 40,120 L 32,120 L 32,80 L 72,80 L 72,88 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </clipPath> + <radialGradient + id="radialGradient3576" + r="111.0006" + cx="51.9995" + cy="-9" + gradientUnits="userSpaceOnUse"> + <stop + offset="0.15" + id="stop4094" + style="stop-color:#80B3FF" /> + <stop + offset="0.316" + id="stop4096" + style="stop-color:#69A1F0" /> + <stop + offset="0.6029" + id="stop4098" + style="stop-color:#4888DA" /> + <stop + offset="0.8412" + id="stop4100" + style="stop-color:#3378CC" /> + <stop + offset="1" + id="stop4102" + style="stop-color:#2C72C7" /> + </radialGradient> + <radialGradient + id="radialGradient4029" + r="130.5231" + gradientTransform="matrix(0.198406,0,-5.256355e-3,-0.198406,-452.9859,-58.52922)" + cx="336.8938" + cy="-319.7261" + gradientUnits="userSpaceOnUse"> + <stop + offset="0" + id="stop4031" + style="stop-color:#eaf1f9;stop-opacity:1;" /> + <stop + offset="1" + id="stop4033" + style="stop-color:#6f9dd4;stop-opacity:1;" /> + </radialGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient4043" + gradientTransform="matrix(0.6271072,1.3435609,-0.7440573,0.3472888,538.32007,-171.10992)" + r="6.4375601" + cy="449.10031" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3966" + cx="345.53156" + fy="447.89981" + fx="343.00021" /> + <clipPath + id="clipPath4039" + clipPathUnits="userSpaceOnUse"> + <path + sodipodi:nodetypes="cscccc" + id="path4041" + style="fill:url(#radialGradient4043);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 415.8125,440.4375 C 414.69896,440.61567 414.33846,443.75374 414.40625,445.3125 C 414.40812,445.35551 414.43282,445.39464 414.4375,445.4375 C 414.49547,443.80258 415.97665,445.88291 416.91692,445.73246 C 424.23751,446.34597 427.00968,449.13044 427.25,455.8125 C 427.38557,448.85411 423.50133,441.08187 415.8125,440.4375 z " /> + </clipPath> + <clipPath + id="clipPath3962" + clipPathUnits="userSpaceOnUse"> + <path + sodipodi:nodetypes="cssccs" + id="path3964" + style="fill:#9e4d00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 358.01834,438.97595 C 357.59747,440.23856 357.22962,442.15708 355.93583,442.4468 C 349.87757,443.80344 345.42647,448.95565 341.35825,451.47101 C 340.38372,452.07355 338.42431,449.84758 338.58157,448.69433 C 340.03178,437.86157 348.08195,432.26287 358.6704,433.26137 C 360.12926,433.53925 358.75442,436.76771 358.01834,438.97595 z " /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3960" + y2="457.31671" + y1="443.57492" + x2="338.31857" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3954" + x1="344.42279" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3826" + y2="481.68478" + y1="490.76556" + x2="414.53983" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3725" + x1="406.42133" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3753" + y2="481.68478" + y1="490.76556" + x2="414.53983" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3725" + x1="406.42133" /> + <clipPath + id="clipPath3721" + clipPathUnits="userSpaceOnUse"> + <path + sodipodi:nodetypes="ccccc" + d="M 412.19342,476.96031 C 410.35061,480.92803 407.68758,484.89576 403.23536,488.86348 L 410.59814,498.18968 L 414.28984,477.93625 L 412.19342,476.96031 z " + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#443d39;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3715)" + id="path3723" /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3666" + y2="601.20837" + y1="507.61142" + x2="335.73438" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3660" + x1="335.73438" /> + <radialGradient + inkscape:collect="always" + id="radialGradient3658" + gradientTransform="matrix(1.2052707,-4.0003338e-2,2.6834447e-2,0.808502,-82.264072,161.43979)" + r="33.234375" + cy="497.40625" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3344" + cx="335.73438" + fy="477.125" + fx="333.77097" /> + <clipPath + id="clipPath3654" + clipPathUnits="userSpaceOnUse"> + <path + sodipodi:nodetypes="cccccccc" + id="path3656" + style="fill:url(#radialGradient3658);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 324.40625,531.66319 C 316.67961,536.03379 303.2331,537.43094 302.5,561.06944 C 312.01264,565.36969 321.20376,567.82558 330.125,568.66319 C 328.5786,556.23989 328.33033,543.49207 324.40625,531.66319 z M 347.0625,531.66319 C 343.15799,544.49609 342.8577,556.42793 341.34375,568.66319 C 350.26499,567.82558 359.45611,565.36969 368.96875,561.06944 C 368.23565,537.43094 354.78914,536.03379 347.0625,531.66319 z " /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3279" + x1="338.62283" + y1="457.90872" + gradientTransform="translate(-95.225391,0)" + x2="339.51855" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3215" + y2="502.82175" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3277" + x1="338.62283" + y1="457.90872" + gradientTransform="translate(-95.225391,0)" + x2="339.51855" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3243" + y2="502.82175" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3275" + x1="335.75745" + y1="507.97568" + gradientTransform="translate(-95.225391,0)" + x2="335.75745" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3163" + y2="464.28983" /> + <clipPath + id="clipPath3271" + clipPathUnits="userSpaceOnUse"> + <path + id="path3273" + d="M 229.42268,467.3088 C 229.51298,471.22964 233.14108,476.22468 230.76643,477.9338 C 223.45451,483.19644 208.11369,483.00448 207.32893,508.3088 C 218.62909,513.41712 229.47403,515.93916 239.95393,516.21505 L 239.95393,516.2463 C 240.14167,516.24433 240.32846,516.21847 240.51643,516.21505 C 240.71484,516.21875 240.91203,516.24422 241.11018,516.2463 L 241.11018,516.21505 C 251.59008,515.93916 262.43501,513.41712 273.73518,508.3088 C 272.95042,483.00448 257.60959,483.19644 250.29768,477.9338 C 247.92303,476.22468 251.55112,471.22964 251.64143,467.3088 L 241.11018,467.3088 L 239.95393,467.3088 L 229.42268,467.3088 z " + style="fill:url(#linearGradient3275);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3277);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3263)" /> + </clipPath> + <linearGradient + inkscape:collect="always" + id="linearGradient3231" + y2="434.86758" + y1="470.94525" + x2="379.6608" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3215" + x1="379.90604" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3229" + y2="434.86758" + y1="470.94525" + x2="379.6608" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3215" + x1="379.90604" /> + <clipPath + id="clipPath3225" + clipPathUnits="userSpaceOnUse"> + <path + id="path3227" + d="M 383.54353,478.3067 C 383.54353,478.3067 383.54353,478.2755 383.54353,478.27545 C 387.76892,478.03106 393.00672,475.3434 395.41853,467.77545 C 397.73728,460.49954 400.0019,441.59235 383.29353,441.4942 C 383.24998,441.49394 383.21234,441.4942 383.16853,441.4942 C 366.45726,441.59036 368.69342,460.49915 371.01228,467.77545 C 373.4286,475.35755 378.68907,478.03988 382.91853,478.27545 C 382.91853,478.2755 382.91853,478.3067 382.91853,478.3067 C 383.02222,478.3067 383.12585,478.30974 383.23103,478.3067 C 383.33227,478.30952 383.44367,478.3067 383.54353,478.3067 z " + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3229);stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3211)" /> + </clipPath> + <linearGradient + id="linearGradient3163"> + <stop + offset="0" + id="stop3165" + style="stop-color:#fff5e4;stop-opacity:1;" /> + <stop + offset="0.25" + id="stop3173" + style="stop-color:#ffecd0;stop-opacity:1;" /> + <stop + offset="0.5" + id="stop3171" + style="stop-color:#ffd390;stop-opacity:1;" /> + <stop + offset="1" + id="stop3167" + style="stop-color:#ffc46a;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3215"> + <stop + offset="0" + id="stop3217" + style="stop-color:#671800;stop-opacity:1;" /> + <stop + offset="1" + id="stop3616" + style="stop-color:#7b3900;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3243"> + <stop + offset="0" + id="stop3245" + style="stop-color:#492200;stop-opacity:1;" /> + <stop + offset="1" + id="stop3247" + style="stop-color:#492200;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3344"> + <stop + offset="0" + id="stop3346" + style="stop-color:#4190f0;stop-opacity:1;" /> + <stop + offset="1" + id="stop3348" + style="stop-color:#003474;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3725"> + <stop + offset="0" + id="stop3727" + style="stop-color:#443d39;stop-opacity:1;" /> + <stop + offset="1" + id="stop3729" + style="stop-color:#443d39;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3733"> + <stop + offset="0" + id="stop3735" + style="stop-color:#e2e2e2;stop-opacity:1;" /> + <stop + offset="1" + id="stop3737" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3776"> + <stop + offset="0" + id="stop3778" + style="stop-color:#e2e2e2;stop-opacity:1;" /> + <stop + offset="1" + id="stop3780" + style="stop-color:#f6f6f6;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3954"> + <stop + offset="0" + id="stop3956" + style="stop-color:#582b00;stop-opacity:1;" /> + <stop + offset="1" + id="stop3958" + style="stop-color:#582b00;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3966"> + <stop + offset="0" + id="stop3968" + style="stop-color:#9e4d00;stop-opacity:1;" /> + <stop + offset="1" + id="stop3970" + style="stop-color:#582b00;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8788-240" + y2="-47.429035" + y1="175.07643" + gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" + x2="81.170044" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5138-431" + x1="68.151932" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5138-431"> + <stop + offset="0" + id="stop9560" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9562" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8790-390" + y2="-52.535206" + y1="151.92928" + gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" + x2="46.899311" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5138-357" + x1="69.878143" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5138-357"> + <stop + offset="0" + id="stop9566" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9568" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8792-242" + y2="-30.656776" + y1="154.70549" + gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" + x2="59.615398" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5138-963" + x1="56.796875" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5138-963"> + <stop + offset="0" + id="stop9572" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9574" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8794-273" + y2="-30.656776" + y1="225.10069" + gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" + x2="59.615398" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5138-418" + x1="50.794651" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5138-418"> + <stop + offset="0" + id="stop9578" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9580" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8796-338" + y2="2.4206059" + x2="-245.23932" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,81.430716,80.369907)" + y1="2.4206059" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + xlink:href="#linearGradient3155-136" + x1="-271.94705" /> + <linearGradient + id="linearGradient3155-136"> + <stop + offset="0" + id="stop9584" + style="stop-color:#c0c0c0;stop-opacity:1;" /> + <stop + offset="0.05494506" + id="stop9586" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="0.13802682" + id="stop9588" + style="stop-color:#cdcdcd;stop-opacity:1;" /> + <stop + offset="1" + id="stop9590" + style="stop-color:#c0c0c0;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8798-742" + r="1.71875" + gradientTransform="matrix(3.701324,0,0,4.437062,825.0355,-247.7547)" + cx="-305.8125" + cy="72.04689" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4314-431" + fy="72.04689" + fx="-305.8125" /> + <linearGradient + id="linearGradient4314-431"> + <stop + offset="0" + id="stop9594" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + offset="1" + id="stop9596" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8800-380" + r="1.71875" + gradientTransform="matrix(-3.701324,0,0,4.437062,-1441.79,-247.7547)" + cx="-305.8125" + cy="72.04689" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4314-973" + fy="72.04689" + fx="-305.8125" /> + <linearGradient + id="linearGradient4314-973"> + <stop + offset="0" + id="stop9600" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + offset="1" + id="stop9602" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8802-299" + r="3.1579585" + gradientTransform="matrix(1.197994,0,0,11.8021,61.03381,-775.397)" + cx="-308.26053" + cy="71.782082" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4328-565" + fy="71.782082" + fx="-308.26053" /> + <linearGradient + inkscape:collect="always" + id="linearGradient4328-565"> + <stop + offset="0" + id="stop9606" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9608" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8804-885" + y2="11.619458" + y1="57.962109" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,81.430716,80.369907)" + x2="-263.14236" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3185-940" + x1="-263.14236" /> + <linearGradient + id="linearGradient3185-940"> + <stop + offset="0" + id="stop9612" + style="stop-color:#575757;stop-opacity:1;" /> + <stop + offset="0.95604396" + id="stop9614" + style="stop-color:#575757;stop-opacity:1;" /> + <stop + offset="1" + id="stop9616" + style="stop-color:#575757;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8806-280" + y2="75.477737" + y1="68.347794" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,75.802165,80.117371)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-504" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-504"> + <stop + offset="0" + id="stop9620" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9622" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8808-332" + y2="75.602806" + y1="70.558701" + gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-936" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-936"> + <stop + offset="0" + id="stop9626" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9628" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8810-82" + y2="75.602806" + y1="70.193672" + gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-362" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-362"> + <stop + offset="0" + id="stop9632" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9634" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8812-828" + y2="75.602806" + y1="70.558701" + gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-408" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-408"> + <stop + offset="0" + id="stop9638" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9640" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8814-817" + y2="75.602806" + y1="70.558701" + gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-537" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-537"> + <stop + offset="0" + id="stop9644" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9646" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8816-697" + y2="75.602806" + y1="69.834503" + gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-734" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-734"> + <stop + offset="0" + id="stop9650" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9652" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8818-387" + y2="75.602806" + y1="70.105728" + gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-288" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-288"> + <stop + offset="0" + id="stop9656" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9658" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8820-174" + y2="75.602806" + y1="70.558701" + gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-880" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-880"> + <stop + offset="0" + id="stop9662" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9664" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8822-224" + y2="75.602806" + y1="70.09758" + gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-633" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-633"> + <stop + offset="0" + id="stop9668" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9670" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8824-600" + y2="75.602806" + y1="69.925575" + gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-626" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-626"> + <stop + offset="0" + id="stop9674" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9676" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8826-227" + y2="75.602806" + y1="69.289864" + gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-637" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-637"> + <stop + offset="0" + id="stop9680" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9682" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8828-860" + y2="75.602806" + y1="69.473351" + gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-1" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-1"> + <stop + offset="0" + id="stop9686" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9688" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8830-802" + y2="75.602806" + y1="68.387428" + gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-384" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-384"> + <stop + offset="0" + id="stop9692" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9694" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8832-779" + y2="75.602806" + y1="67.799118" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,78.389987,80.117371)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-595" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-595"> + <stop + offset="0" + id="stop9698" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9700" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8834-162" + y2="17.674025" + y1="-5.8208742" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.267725,80.302597)" + x2="-308.16672" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3332-935" + x1="-308.16672" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3332-935"> + <stop + offset="0" + id="stop9704" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9706" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8836-403" + y2="74.042549" + y1="68.347794" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,75.802165,-90.302128)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-345" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-345"> + <stop + offset="0" + id="stop9710" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9712" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8838-639" + y2="74.050728" + y1="67.799118" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,78.389987,-90.302128)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-924" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-924"> + <stop + offset="0" + id="stop9716" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9718" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8840-852" + r="3.0016239" + gradientTransform="matrix(0.993747,-0.111657,0.181818,1.618182,-15.10182,-79.18066)" + cx="-308.11151" + cy="73.535744" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3373-257" + fy="73.535744" + fx="-308.11151" /> + <linearGradient + id="linearGradient3373-257"> + <stop + offset="0" + id="stop9722" + style="stop-color:#a1a1a1;stop-opacity:1;" /> + <stop + offset="0.81318682" + id="stop9724" + style="stop-color:#d7d7d7;stop-opacity:1;" /> + <stop + offset="1" + id="stop9726" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8842-960" + r="3.0016239" + cx="-307.9166" + cy="72.469955" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3394-952" + fy="72.469955" + fx="-307.9166" /> + <linearGradient + id="linearGradient3394-952"> + <stop + offset="0" + id="stop9730" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="0.93406594" + id="stop9732" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9734" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8844-345" + r="3.0016239" + cx="-307.9166" + cy="72.469955" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3373-528" + fy="73.394211" + fx="-307.9166" /> + <linearGradient + id="linearGradient3373-528"> + <stop + offset="0" + id="stop9738" + style="stop-color:#a1a1a1;stop-opacity:1;" /> + <stop + offset="0.81318682" + id="stop9740" + style="stop-color:#d7d7d7;stop-opacity:1;" /> + <stop + offset="1" + id="stop9742" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8846-419" + y2="75.602806" + y1="69.289864" + gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-145" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-145"> + <stop + offset="0" + id="stop9746" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9748" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8848-408" + y2="75.602806" + y1="69.473351" + gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-95" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-95"> + <stop + offset="0" + id="stop9752" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9754" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8850-218" + y2="75.602806" + y1="68.387428" + gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" + x2="-199.18291" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3197-851" + x1="-199.18291" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3197-851"> + <stop + offset="0" + id="stop9758" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9760" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + id="radialGradient8852-503" + r="17.759607" + gradientTransform="matrix(9.2600781e-2,0,0,6.0990382e-2,87.267725,80.593034)" + cx="-326.17645" + cy="20.49044" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + xlink:href="#linearGradient4645-53" + fy="32.982586" + fx="-324.23087" /> + <linearGradient + inkscape:collect="always" + id="linearGradient4645-53"> + <stop + offset="0" + id="stop9764" + style="stop-color:#c4c4c4;stop-opacity:1;" /> + <stop + offset="1" + id="stop9766" + style="stop-color:#c4c4c4;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8854-34" + y2="143.7717" + y1="-29.916986" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.218595,80.369907)" + x2="-237.00941" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4367-760" + x1="-344.84647" /> + <linearGradient + inkscape:collect="always" + id="linearGradient4367-760"> + <stop + offset="0" + id="stop9770" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + offset="1" + id="stop9772" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8856-755" + y2="81.967781" + y1="213.61119" + gradientTransform="matrix(8.8862736e-2,0,0,6.4589754e-2,53.234665,80.265175)" + x2="61.920132" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5298-641" + x1="79.793121" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5298-641"> + <stop + offset="0" + id="stop9776" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + offset="1" + id="stop9778" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8858-758" + y2="12.583951" + y1="64.938179" + gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.267725,80.369907)" + x2="-268.89709" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4635-148" + x1="-313.55511" /> + <linearGradient + inkscape:collect="always" + id="linearGradient4635-148"> + <stop + offset="0" + id="stop9782" + style="stop-color:#c4c4c4;stop-opacity:1;" /> + <stop + offset="1" + id="stop9784" + style="stop-color:#c4c4c4;stop-opacity:0;" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="29.061501" + y1="20.361799" + x2="29.112801" + y2="20.361799" + id="XMLID_102_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop270" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop272" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop274" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="28.059601" + y1="23.623501" + x2="28.2612" + y2="23.623501" + id="XMLID_101_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop261" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop263" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop265" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="28.949699" + y1="20.691401" + x2="29.024401" + y2="20.691401" + id="XMLID_100_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop252" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop254" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop256" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="28.805201" + y1="21.127001" + x2="28.9102" + y2="21.127001" + id="XMLID_99_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop243" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop245" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop247" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="28.278799" + y1="22.257799" + x2="28.795401" + y2="22.257799" + id="XMLID_98_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop234" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop236" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop238" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="21.637699" + y1="60.8311" + x2="22.4736" + y2="60.8311" + id="XMLID_96_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop216" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop218" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop220" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="22.757299" + y1="39.152802" + x2="27.8032" + y2="39.152802" + id="XMLID_95_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop11322" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop11324" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop211" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="22.4995" + y1="54.563499" + x2="22.7397" + y2="54.563499" + id="XMLID_94_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop198" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop11317" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop11319" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="27.808599" + y1="24.5352" + x2="28.0327" + y2="24.5352" + id="XMLID_93_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop189" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop191" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop11313" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="29.142599" + y1="20.1499" + x2="29.165001" + y2="20.1499" + id="XMLID_91_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop171" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop173" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop11303" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="96.549797" + y1="38.7085" + x2="101.8271" + y2="38.7085" + id="XMLID_90_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop162" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop164" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop166" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="102.1084" + y1="60.8242" + x2="102.9473" + y2="60.8242" + id="XMLID_89_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop153" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop155" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop157" /> + </linearGradient> + <linearGradient + gradientTransform="translate(3.719016,26.033112)" + x1="101.8428" + y1="54.5625" + x2="102.084" + y2="54.5625" + id="XMLID_88_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#204fa1;stop-opacity:1" + offset="0" + id="stop144" /> + <stop + style="stop-color:#4a8cd9;stop-opacity:1" + offset="0.118" + id="stop146" /> + <stop + style="stop-color:#bae1ff;stop-opacity:1" + offset="1" + id="stop148" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3163" + id="linearGradient3330" + x1="412.78592" + y1="400.84558" + x2="412.78592" + y2="422.63611" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3849"> + <stop + style="stop-color:#28691f;stop-opacity:1;" + offset="0" + id="stop3851" /> + <stop + style="stop-color:#42ad33;stop-opacity:1;" + offset="1" + id="stop3853" /> + </linearGradient> + <linearGradient + id="linearGradient3855"> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0" + id="stop3857" /> + <stop + id="stop3859" + offset="0.4375" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0.56588125" + id="stop3861" /> + <stop + id="stop3863" + offset="0.76237977" + style="stop-color:#000000;stop-opacity:0.24705882;" /> + <stop + id="stop3865" + offset="0.77884614" + style="stop-color:#000000;stop-opacity:0.49803922;" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0.875" + id="stop3867" /> + <stop + id="stop3869" + offset="0.875" + style="stop-color:#000000;stop-opacity:0.49803922;" /> + <stop + id="stop3871" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3879"> + <stop + style="stop-color:#c3c3c3;stop-opacity:1;" + offset="0" + id="stop3881" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop3883" /> + </linearGradient> + <linearGradient + id="linearGradient3885"> + <stop + id="stop3887" + offset="0" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0.4375" + id="stop3889" /> + <stop + id="stop3891" + offset="0.58240438" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0.49803922;" + offset="0.76442307" + id="stop3893" /> + <stop + id="stop3895" + offset="0.875" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0.49803922;" + offset="0.91826922" + id="stop3897" /> + <stop + id="stop3899" + offset="0.96048182" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3901" /> + </linearGradient> + <linearGradient + id="linearGradient3903"> + <stop + id="stop3905" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3907" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3909"> + <stop + style="stop-color:#2d2d2d;stop-opacity:1;" + offset="0" + id="stop3911" /> + <stop + id="stop3913" + offset="0.5" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop3915" /> + </linearGradient> + <linearGradient + id="linearGradient3917"> + <stop + style="stop-color:#ffffff;stop-opacity:0.68345326;" + offset="0" + id="stop3919" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3921" /> + </linearGradient> + <linearGradient + id="linearGradient3923"> + <stop + style="stop-color:#ffffff;stop-opacity:0.55035973;" + offset="0" + id="stop3925" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3927" /> + </linearGradient> + <linearGradient + id="linearGradient3929"> + <stop + id="stop3931" + offset="0" + style="stop-color:#ffffff;stop-opacity:0.55035973;" /> + <stop + id="stop3933" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3935"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3937" /> + <stop + style="stop-color:#131313;stop-opacity:0;" + offset="1" + id="stop3939" /> + </linearGradient> + <linearGradient + id="linearGradient3947"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3949" /> + <stop + style="stop-color:#aeaeae;stop-opacity:1;" + offset="1" + id="stop3951" /> + </linearGradient> + <linearGradient + id="linearGradient3959"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3961" /> + <stop + style="stop-color:#252525;stop-opacity:0;" + offset="1" + id="stop3963" /> + </linearGradient> + <linearGradient + id="linearGradient3965"> + <stop + style="stop-color:#b4942a;stop-opacity:1;" + offset="0" + id="stop3967" /> + <stop + style="stop-color:#e4dcc9;stop-opacity:1" + offset="1" + id="stop3969" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="radialGradient3971" + cx="63.912209" + cy="115.70919" + fx="63.912209" + fy="115.7093" + r="63.912209" + gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="radialGradient3973" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.519831,9.412826e-2,-0.895354,13.78472,115.1882,-1545.166)" + cx="42.617531" + cy="120.64188" + fx="42.617531" + fy="120.64188" + r="3.406888" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3311" + id="radialGradient3975" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.22884e-2,-1.47547e-4,1.889714e-3,0.798624,69.12243,5.487066)" + cx="95.505852" + cy="59.591507" + fx="95.505852" + fy="59.591507" + r="47.746404" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="radialGradient3977" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297066,3.012623e-3,-1.134728e-3,0.488669,7.096503,-13.69501)" + cx="49.009884" + cy="8.4953122" + fx="47.370888" + fy="6.7701697" + r="3.9750405" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3217" + id="linearGradient3979" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-3.693584e-16,3.693584e-16,1.29707,7.064707,-20.57911)" + x1="48.914677" + y1="2.9719031" + x2="48.913002" + y2="2.5548496" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="radialGradient3981" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-4.501275e-16,6.640356e-17,0.1578,7.064707,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3235" + id="linearGradient3983" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297066,3.012623e-3,-3.012623e-3,1.297066,7.112448,-20.56258)" + x1="48.498562" + y1="0.81150496" + x2="48.732723" + y2="2.3657269" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient3985" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.28993,-5.022494e-16,5.050298e-16,1.29707,7.402337,-20.57911)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3273" + id="radialGradient3987" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.860164,-2.800126e-16,6.473209e-17,0.1578,24.75801,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient3989" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.279856,4.983275e-16,-5.050298e-16,1.29707,-133.3868,-20.57911)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3259" + id="radialGradient3991" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.853446,3.872019e-16,-5.817635e-17,0.1578,-116.1668,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3303" + id="radialGradient3993" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,7.573576e-17,-1.374554e-18,2.608014e-2,-7.697455e-14,7.26766)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595197" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3325" + id="radialGradient3995" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595196" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3259" + id="radialGradient3997" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.853446,3.879821e-16,-5.832064e-17,0.1578,-115.9141,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient3999" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.279856,4.994967e-16,-5.062158e-16,1.29707,-133.1341,-10.31269)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3273" + id="radialGradient4001" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.860164,-2.80798e-16,6.487638e-17,0.1578,24.50481,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient4003" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.28993,-5.034291e-16,5.062158e-16,1.29707,7.14915,-10.31269)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3235" + id="linearGradient4005" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297068,-1.880044e-3,1.880044e-3,1.297068,6.796523,-10.3225)" + x1="48.498562" + y1="0.81150496" + x2="48.732723" + y2="2.3657269" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="radialGradient4007" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-4.513135e-16,6.654785e-17,0.1578,6.81152,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3217" + id="linearGradient4009" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-3.705444e-16,3.705444e-16,1.29707,6.81152,-10.31269)" + x1="48.914677" + y1="2.9719031" + x2="48.913002" + y2="2.5548496" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="radialGradient4011" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297068,-1.880044e-3,7.085819e-4,0.48867,6.806484,-3.45491)" + cx="49.009884" + cy="8.4953122" + fx="47.370888" + fy="6.7701697" + r="3.9750405" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3311" + id="radialGradient4013" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.228741e-2,-3.825032e-4,4.90218e-3,0.798611,68.90433,5.49306)" + cx="95.505852" + cy="59.591507" + fx="95.505852" + fy="59.591507" + r="47.746404" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="radialGradient4015" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.520175,8.839467e-2,-0.843351,13.788,109.1206,-1545.323)" + cx="42.617531" + cy="120.64188" + fx="42.617531" + fy="120.64188" + r="3.406888" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3325" + id="radialGradient4017" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595196" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2362" + id="linearGradient4019" + x1="74.332748" + y1="17.912012" + x2="54.983063" + y2="90.126022" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.180422,0,0,1.180422,-10.39088,-10.58642)" /> + <linearGradient + id="linearGradient4021"> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000" + offset="0.0000000" + id="stop4023" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.0000000" + offset="1.0000000" + id="stop4025" /> + </linearGradient> + <radialGradient + r="139.55859" + fy="142.6467" + fx="128.37613" + cy="142.6467" + cx="128.37613" + gradientTransform="matrix(1.2968852,0,0,1.439407,-188.06465,-41.410401)" + gradientUnits="userSpaceOnUse" + id="radialGradient3308" + xlink:href="#XMLID_8_" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="108" + x2="96" + y1="56" + x1="100" + id="linearGradient3300" + xlink:href="#radialGradient3696" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(144,0)" + y2="75.945503" + x2="-45.818714" + y1="96.082298" + x1="-45.818714" + gradientUnits="userSpaceOnUse" + id="linearGradient4197" + xlink:href="#linearGradient3109" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3223" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3219" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient4193" + xlink:href="#linearGradient5412" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3205" + xlink:href="#linearGradient5412" + inkscape:collect="always" /> + <filter + id="filter3191" + inkscape:collect="always"> + <feGaussianBlur + id="feGaussianBlur3193" + stdDeviation="0.2025" + inkscape:collect="always" /> + </filter> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3097" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="19.281664" + x2="80" + y1="15.336544" + x1="73.742638" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3093" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="72" + x2="14.697635" + y1="96" + x1="26.697636" + gradientTransform="translate(81.302365,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient3089" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="96.001434" + x2="11.68106" + y1="52" + x1="6.6976352" + gradientTransform="translate(81.302365,0)" + gradientUnits="userSpaceOnUse" + id="linearGradient3085" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(81.3125,0)" + gradientUnits="userSpaceOnUse" + y2="108.0104" + x2="11.68106" + y1="60.539303" + x1="11.68106" + id="linearGradient3060" + xlink:href="#linearGradient3202" + inkscape:collect="always" /> + <radialGradient + gradientTransform="translate(144,0)" + gradientUnits="userSpaceOnUse" + r="24" + fy="100" + fx="-60" + cy="84" + cx="-44" + id="radialGradient3036" + xlink:href="#linearGradient3030" + inkscape:collect="always" /> + <radialGradient + gradientTransform="translate(144,0)" + gradientUnits="userSpaceOnUse" + r="20" + fy="96" + fx="-40" + cy="84" + cx="-44" + id="radialGradient3026" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(144,0)" + gradientUnits="userSpaceOnUse" + y2="104.80668" + x2="-62.424866" + y1="76.708466" + x1="-13.757333" + id="linearGradient3024" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="117.07014" + x2="95.5" + y1="57.608395" + x1="95.5" + id="linearGradient3971" + xlink:href="#radialGradient3351" + inkscape:collect="always" /> + <radialGradient + r="139.55859" + fy="142.6467" + fx="128.37613" + cy="142.6467" + cx="128.37613" + gradientTransform="matrix(1.2968852,0,0,1.439407,-43.366528,-58.450233)" + gradientUnits="userSpaceOnUse" + id="radialGradient3909" + xlink:href="#XMLID_8_" + inkscape:collect="always" /> + <clipPath + id="clipPath3905" + clipPathUnits="userSpaceOnUse"> + <path + style="fill:url(#radialGradient3909);fill-opacity:1" + d="M 10,9 C 9.449,9 9,9.449 9,10 L 9,118 C 9,118.552 9.449,119 10,119 L 102.307,118.879 C 102.52855,118.879 103,118.435 103,118.172 L 103,10 C 103,9.449 102.552,9 102,9 L 10,9 z " + id="path3907" + sodipodi:nodetypes="ccccccccc" /> + </clipPath> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,-136,-152.52234)" + gradientUnits="userSpaceOnUse" + id="radialGradient3832" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + y2="65.448112" + x2="173.98071" + y1="123.75864" + x1="179.17224" + gradientTransform="translate(-136,-142.00448)" + gradientUnits="userSpaceOnUse" + id="linearGradient3828" + xlink:href="#linearGradient3295" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3449"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3451" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3453" /> + </linearGradient> + <linearGradient + id="linearGradient4062"> + <stop + style="stop-color:#baff63;stop-opacity:1;" + offset="0" + id="stop3680" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3682" /> + </linearGradient> + <linearGradient + id="linearGradient4066"> + <stop + style="stop-color:#cbff9c;stop-opacity:1;" + offset="0" + id="stop3204" /> + <stop + style="stop-color:#65c171;stop-opacity:0" + offset="1" + id="stop3206" /> + </linearGradient> + <linearGradient + id="linearGradient3647"> + <stop + style="stop-color:#c2ebab;stop-opacity:1;" + offset="0" + id="stop3649" /> + <stop + style="stop-color:#71d03c;stop-opacity:0;" + offset="1" + id="stop3651" /> + </linearGradient> + <radialGradient + id="radialGradient3696" + cx="48" + cy="-0.2148" + r="55.148" + gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" + gradientUnits="userSpaceOnUse"> + <stop + offset="0" + style="stop-color:#72D13D" + id="stop3698" /> + <stop + offset="0.3553" + style="stop-color:#35AC1C" + id="stop3700" /> + <stop + offset="0.6194" + style="stop-color:#0F9508" + id="stop3702" /> + <stop + offset="0.7574" + style="stop-color:#008C00" + id="stop3704" /> + <stop + offset="1" + style="stop-color:#007A00" + id="stop3706" /> + </radialGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient3470" + x1="123.5" + y1="76" + x2="220.5" + y2="76" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3482" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3575" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3592" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,-108,-22.517857)" + cx="172" + cy="76" + fx="175" + fy="103.23137" + r="56" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient3633" + gradientUnits="userSpaceOnUse" + x1="123.5" + y1="76" + x2="220.5" + y2="76" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3647" + id="linearGradient3653" + x1="174.5" + y1="36.566975" + x2="174.5" + y2="93.199982" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3647" + id="linearGradient4086" + gradientUnits="userSpaceOnUse" + x1="174.5" + y1="36.566975" + x2="174.5" + y2="93.199982" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3184" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient4089" + gradientUnits="userSpaceOnUse" + x1="123.5" + y1="76" + x2="220.5" + y2="76" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3295" + id="linearGradient4144" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="74.75" + y1="14.275884" + x2="78.939339" + y2="16.750759" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3465" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3467" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="180.75" + fy="125.04931" + r="56" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3295" + id="linearGradient3517" + x1="179.17224" + y1="123.75864" + x2="173.98071" + y2="65.448112" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3295" + id="linearGradient2220" + gradientUnits="userSpaceOnUse" + x1="179.17224" + y1="123.75864" + x2="173.98071" + y2="65.448112" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3295" + id="linearGradient3738" + gradientUnits="userSpaceOnUse" + x1="179.17224" + y1="123.75864" + x2="173.98071" + y2="65.448112" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient2236" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient2238" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="180.75" + fy="125.04931" + r="56" /> + <linearGradient + y2="57.279232" + x2="226.659" + y1="53.784153" + x1="223.32712" + spreadMethod="reflect" + gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)" + gradientUnits="userSpaceOnUse" + id="linearGradient3418" + xlink:href="#linearGradient3202" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="65.448112" + x2="173.98071" + y1="123.75864" + x1="179.17224" + id="linearGradient3415" + xlink:href="#linearGradient3295" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="125.04931" + fx="180.75" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3409" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3407" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5816285,1.767767e-2,-2.6986249e-2,0.8878982,31.921846,5.9419094)" + r="60" + fy="66.344505" + fx="72.020813" + cy="66.344505" + cx="72.020813" + id="radialGradient3405" + xlink:href="#linearGradient3449" + inkscape:collect="always" /> + <linearGradient + spreadMethod="reflect" + y2="57.279232" + x2="226.659" + y1="53.784153" + x1="223.32712" + gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)" + gradientUnits="userSpaceOnUse" + id="linearGradient3399" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(1,0,0,0.8610463,-108,-1.4361867)" + y2="108.51858" + x2="212" + y1="76" + x1="108" + gradientUnits="userSpaceOnUse" + id="linearGradient4127" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + y2="16.750759" + x2="78.939339" + y1="14.275884" + x1="74.75" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + id="linearGradient3395" + xlink:href="#linearGradient3295" + inkscape:collect="always" /> + <linearGradient + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + y2="16.750759" + x2="78.939339" + y1="15.336544" + x1="73.742638" + id="linearGradient3389" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <linearGradient + y2="76" + x2="220.5" + y1="76" + x1="123.5" + gradientUnits="userSpaceOnUse" + id="linearGradient3387" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="76.455902" + x2="67.73996" + y1="13.043323" + x1="79.589897" + id="linearGradient3385" + xlink:href="#linearGradient3260" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="125.04931" + fx="180.75" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3383" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="83.235832" + x2="75.957108" + y1="16.154284" + x1="74.03466" + id="linearGradient3381" + xlink:href="#linearGradient3202" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient9932" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + y2="93.199982" + x2="174.5" + y1="36.566975" + x1="174.5" + gradientUnits="userSpaceOnUse" + id="linearGradient9930" + xlink:href="#linearGradient3647" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="93.199982" + x2="174.5" + y1="36.566975" + x1="174.5" + id="linearGradient9928" + xlink:href="#linearGradient3647" + inkscape:collect="always" /> + <linearGradient + y2="76" + x2="220.5" + y1="76" + x1="123.5" + gradientUnits="userSpaceOnUse" + id="linearGradient3373" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3371" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="103.23137" + fx="175" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,-108,-22.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3369" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + gradientUnits="userSpaceOnUse" + id="radialGradient3367" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + id="radialGradient3365" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="76" + x2="220.5" + y1="76" + x1="123.5" + id="linearGradient3363" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" + r="55.148" + cy="-0.2148" + cx="48" + id="radialGradient3351"> + <stop + id="stop3353" + style="stop-color:#72D13D" + offset="0" /> + <stop + id="stop3355" + style="stop-color:#35AC1C" + offset="0.3553" /> + <stop + id="stop3357" + style="stop-color:#0F9508" + offset="0.6194" /> + <stop + id="stop3359" + style="stop-color:#008C00" + offset="0.7574" /> + <stop + id="stop3361" + style="stop-color:#007A00" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient3345"> + <stop + id="stop4103" + offset="0" + style="stop-color:#c2ebab;stop-opacity:1;" /> + <stop + id="stop3349" + offset="1" + style="stop-color:#71d03c;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3339"> + <stop + id="stop3341" + offset="0" + style="stop-color:#cbff9c;stop-opacity:1;" /> + <stop + id="stop3343" + offset="1" + style="stop-color:#65c171;stop-opacity:0" /> + </linearGradient> + <linearGradient + id="linearGradient3327"> + <stop + id="stop4095" + offset="0" + style="stop-color:#baff63;stop-opacity:1;" /> + <stop + id="stop4097" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3453" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3295" + id="linearGradient3458" + gradientUnits="userSpaceOnUse" + x1="179.17224" + y1="123.75864" + x2="173.98071" + y2="65.448112" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient5446"> + <stop + id="stop5448" + style="stop-color:#FFEA00" + offset="0" /> + <stop + id="stop5450" + style="stop-color:#c66200;stop-opacity:1;" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient5412" + gradientUnits="userSpaceOnUse" + x1="28" + y1="57.5" + x2="28" + y2="0"> + <stop + offset="0" + style="stop-color:#fff14d;stop-opacity:1;" + id="stop5414" /> + <stop + offset="1" + style="stop-color:#f8ffa0;stop-opacity:0;" + id="stop5416" /> + </linearGradient> + <linearGradient + id="linearGradient5368"> + <stop + style="stop-color:#0590ff;stop-opacity:1;" + offset="0" + id="stop5370" /> + <stop + style="stop-color:#c6e6ff;stop-opacity:1;" + offset="1" + id="stop5372" /> + </linearGradient> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient4992"> + <stop + id="stop4994" + style="stop-color:#FFEA00" + offset="0" /> + <stop + id="stop4996" + style="stop-color:#ffa000;stop-opacity:0" + offset="1" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="radialGradient3401" + gradientUnits="userSpaceOnUse" + cx="111" + cy="144.49577" + r="139.55859" + gradientTransform="translate(-12,4)" + fx="111" + fy="144.49577" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="radialGradient9890" + gradientUnits="userSpaceOnUse" + cx="138.91406" + cy="148.63283" + r="139.5585" + gradientTransform="translate(-12,4)" + fx="138.91406" + fy="148.63283" /> + <linearGradient + id="linearGradient3443"> + <stop + style="stop-color:#747474;stop-opacity:1;" + offset="0" + id="stop3445" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop4154" /> + </linearGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + r="111.0006" + cy="-9" + cx="51.9995" + id="radialGradient4071" + gradientTransform="translate(-103.157,-34.959)"> + <stop + id="stop2424" + style="stop-color:#80B3FF" + offset="0.15" /> + <stop + id="stop4158" + style="stop-color:#163a66;stop-opacity:1;" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient2575" + gradientUnits="userSpaceOnUse" + x1="28" + y1="57.5" + x2="28" + y2="0"> + <stop + offset="0" + style="stop-color:#FFEA00" + id="stop2577" /> + <stop + offset="1" + style="stop-color:#ffa000;stop-opacity:1;" + id="stop2579" /> + </linearGradient> + <linearGradient + y2="65.448112" + x2="173.98071" + y1="123.75864" + x1="179.17224" + gradientUnits="userSpaceOnUse" + id="linearGradient2226" + xlink:href="#linearGradient3295" + inkscape:collect="always" + gradientTransform="translate(-136,-142.00448)" /> + <filter + id="filter3387" + height="1.249912" + y="-0.12495601" + width="1.2041403" + x="-0.10207015" + inkscape:collect="always"> + <feGaussianBlur + id="feGaussianBlur3389" + stdDeviation="0.44655691" + inkscape:collect="always" /> + </filter> + <radialGradient + r="56" + fy="76" + fx="172" + cy="76" + cx="172" + gradientTransform="matrix(1,0,0,1.1383929,-136,-152.52234)" + gradientUnits="userSpaceOnUse" + id="radialGradient3629" + xlink:href="#XMLID_4_" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" + r="55.148" + cy="-0.2148" + cx="48" + id="XMLID_4_"> + <stop + id="stop3082" + style="stop-color:#72D13D" + offset="0" /> + <stop + id="stop3084" + style="stop-color:#35AC1C" + offset="0.3553" /> + <stop + id="stop3086" + style="stop-color:#0F9508" + offset="0.6194" /> + <stop + id="stop3088" + style="stop-color:#008C00" + offset="0.7574" /> + <stop + id="stop3090" + style="stop-color:#007A00" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient3260" + inkscape:collect="always"> + <stop + id="stop3262" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3264" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3295"> + <stop + id="stop3297" + offset="0" + style="stop-color:#fdff63;stop-opacity:1;" /> + <stop + id="stop3299" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient3751" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1.9038358,1.6066243,0,10.102626,349.18714)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient4745" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1.9038358,1.6066243,0,10.102626,349.18714)" + cx="172" + cy="76" + fx="172" + fy="76" + r="56" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient3446"> + <stop + id="stop3448" + style="stop-color:#FFEA00" + offset="0" /> + <stop + id="stop4183" + style="stop-color:#FFCC00" + offset="1" /> + </linearGradient> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient3456" + xlink:href="#linearGradient3287" + inkscape:collect="always" /> + <linearGradient + y2="51.1875" + x2="-39.53125" + y1="78" + x1="-39.53125" + gradientTransform="translate(69.54139,-45.18897)" + gradientUnits="userSpaceOnUse" + id="linearGradient4708" + xlink:href="#linearGradient18668" + inkscape:collect="always" /> + <radialGradient + gradientTransform="translate(-157.79665,3.3542977)" + fy="135.7422" + fx="121.14062" + r="139.5585" + cy="135.7422" + cx="121.14062" + gradientUnits="userSpaceOnUse" + id="radialGradient2886" + xlink:href="#XMLID_7_" + inkscape:collect="always" /> + <radialGradient + fy="142.6467" + fx="128.37613" + r="139.55859" + cy="142.6467" + cx="128.37613" + gradientTransform="matrix(1.2968852,0,0,1.439407,-43.366528,-58.450233)" + gradientUnits="userSpaceOnUse" + id="radialGradient2883" + xlink:href="#XMLID_8_" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(69.54139,-45.18897)" + y2="51.1875" + x2="-39.53125" + y1="78" + x1="-39.53125" + gradientUnits="userSpaceOnUse" + id="linearGradient18749" + xlink:href="#linearGradient18668" + inkscape:collect="always" /> + <linearGradient + y2="51.1875" + x2="-39.53125" + y1="78" + x1="-39.53125" + gradientUnits="userSpaceOnUse" + id="linearGradient18746" + xlink:href="#linearGradient18668" + inkscape:collect="always" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient18744" + xlink:href="#XMLID_2_" + inkscape:collect="always" /> + <linearGradient + y2="51.1875" + x2="-39.53125" + y1="78" + x1="-39.53125" + gradientUnits="userSpaceOnUse" + id="linearGradient18674" + xlink:href="#linearGradient18668" + inkscape:collect="always" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient18649"> + <stop + id="stop18651" + style="stop-color:#FFEA00" + offset="0" /> + <stop + id="stop18653" + style="stop-color:#FFCC00" + offset="1" /> + </linearGradient> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient18657" + xlink:href="#XMLID_2_" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.754978,-2.959381e-2,0,0.905772,7.650275,10.87807)" + r="8.968153" + fy="31.045055" + fx="26.954102" + cy="31.045055" + cx="26.954102" + id="radialGradient15986" + xlink:href="#linearGradient15967" + inkscape:collect="always" /> + <linearGradient + y2="100.82378" + x2="-18.121965" + y1="100.82378" + x1="-74.820707" + gradientUnits="userSpaceOnUse" + id="linearGradient15977" + xlink:href="#linearGradient2309" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(1.470416e-5,0)" + y2="30.441185" + x2="27.719746" + y1="7.881104" + x1="27.719746" + gradientUnits="userSpaceOnUse" + id="linearGradient15973" + xlink:href="#linearGradient15967" + inkscape:collect="always" /> + <linearGradient + y2="100.82378" + x2="-18.121965" + y1="100.82378" + x1="-74.820707" + gradientUnits="userSpaceOnUse" + id="linearGradient14189" + xlink:href="#linearGradient2309" + inkscape:collect="always" /> + <linearGradient + y2="100.82378" + x2="-18.121965" + y1="100.82378" + x1="-74.820707" + gradientUnits="userSpaceOnUse" + id="linearGradient14180" + xlink:href="#linearGradient2309" + inkscape:collect="always" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient12378" + xlink:href="#XMLID_2_" + inkscape:collect="always" /> + <foreignObject + id="foreignObject4205" + height="1" + width="1" + y="0" + x="0" + requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> + <i:pgfRef + xlink:href="#adobe_illustrator_pgf" /> + </foreignObject> + <radialGradient + r="139.55859" + cy="112.3047" + cx="102" + gradientUnits="userSpaceOnUse" + id="radialGradient2467" + xlink:href="#XMLID_8_" + inkscape:collect="always" /> + <radialGradient + r="139.5585" + cy="112.3047" + cx="102" + gradientUnits="userSpaceOnUse" + id="radialGradient2465" + xlink:href="#XMLID_7_" + inkscape:collect="always" /> + <linearGradient + y2="96.0002" + x2="88.0002" + y1="104" + x1="96" + gradientUnits="userSpaceOnUse" + id="linearGradient2397" + xlink:href="#XMLID_12_" + inkscape:collect="always" /> + <linearGradient + y2="95.293" + x2="87.293" + y1="103" + x1="95" + gradientUnits="userSpaceOnUse" + id="linearGradient2395" + xlink:href="#XMLID_11_" + inkscape:collect="always" /> + <linearGradient + y2="94.5865" + x2="86.5865" + y1="103" + x1="95" + gradientUnits="userSpaceOnUse" + id="linearGradient2393" + xlink:href="#XMLID_10_" + inkscape:collect="always" /> + <linearGradient + y2="94.5366" + x2="86.5356" + y1="102.3447" + x1="94.3438" + gradientUnits="userSpaceOnUse" + id="linearGradient2391" + xlink:href="#XMLID_9_" + inkscape:collect="always" /> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="XMLID_2_"> + <stop + id="stop12" + style="stop-color:#FFEA00" + offset="0" /> + <stop + id="stop14" + style="stop-color:#FFCC00" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient15967" + gradientUnits="userSpaceOnUse" + x1="28" + y1="57.5" + x2="28" + y2="0"> + <stop + offset="0" + style="stop-color:white;stop-opacity:1;" + id="stop15969" /> + <stop + offset="1" + style="stop-color:white;stop-opacity:0;" + id="stop15971" /> + </linearGradient> + <linearGradient + id="linearGradient18668" + gradientUnits="userSpaceOnUse" + x1="28" + y1="57.5" + x2="28" + y2="0"> + <stop + offset="0" + style="stop-color:#fff8a8;stop-opacity:1;" + id="stop18670" /> + <stop + offset="1" + style="stop-color:white;stop-opacity:0;" + id="stop18672" /> + </linearGradient> + <linearGradient + id="linearGradient4222"> + <stop + id="stop4007" + offset="0" + style="stop-color:black;stop-opacity:1" /> + <stop + id="stop4009" + offset="1" + style="stop-color:black;stop-opacity:0" /> + </linearGradient> + <linearGradient + id="linearGradient3287" + gradientUnits="userSpaceOnUse" + x1="28" + y1="57.5" + x2="28" + y2="0"> + <stop + offset="0" + style="stop-color:#FFEA00" + id="stop3289" /> + <stop + offset="1" + style="stop-color:#ffa000;stop-opacity:1;" + id="stop3291" /> + </linearGradient> + <linearGradient + id="linearGradient3030" + inkscape:collect="always"> + <stop + id="stop3032" + offset="0" + style="stop-color:#000000;stop-opacity:0.77902622" /> + <stop + id="stop3034" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + y2="0" + x2="28" + y1="57.5" + x1="28" + gradientUnits="userSpaceOnUse" + id="linearGradient3109"> + <stop + id="stop3111" + style="stop-color:#fff8a8;stop-opacity:1;" + offset="0" /> + <stop + id="stop3113" + style="stop-color:white;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="linearGradient4226" + gradientTransform="scale(1.039383,0.9621093)" + x1="64.341991" + y1="18.50366" + x2="76.284438" + y2="18.50366" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="linearGradient4228" + x1="79.75" + y1="84" + x2="120.25" + y2="84" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#radialGradient3696" + id="linearGradient4230" + gradientUnits="userSpaceOnUse" + x1="100" + y1="56" + x2="96" + y2="108" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient4232" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(144,0)" + x1="-13.757333" + y1="76.708466" + x2="-62.424866" + y2="104.80668" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4234" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4236" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5412" + id="linearGradient4238" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="linearGradient4240" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.039383,0.9621093)" + x1="64.341991" + y1="18.50366" + x2="76.284438" + y2="18.50366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4242" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3030" + id="radialGradient4244" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(144,0)" + cx="-44" + cy="84" + fx="-60" + fy="100" + r="24" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4246" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient4248" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(144,0)" + cx="-44" + cy="84" + fx="-40" + fy="96" + r="20" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3202" + id="linearGradient4250" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(81.3125,0)" + x1="11.68106" + y1="60.539303" + x2="11.68106" + y2="108.0104" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4252" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(81.302365,0)" + x1="6.6976352" + y1="52" + x2="11.68106" + y2="96.001434" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient4254" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(81.302365,0)" + x1="26.697636" + y1="96" + x2="14.697635" + y2="72" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="linearGradient4256" + gradientUnits="userSpaceOnUse" + x1="79.75" + y1="84" + x2="120.25" + y2="84" /> + <linearGradient + inkscape:collect="always" + xlink:href="#radialGradient3696" + id="linearGradient4301" + gradientUnits="userSpaceOnUse" + x1="100" + y1="56" + x2="96" + y2="108" + gradientTransform="translate(-138.69812,17.039832)" /> + <radialGradient + r="165.9342" + cy="114" + cx="112.667" + gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" + gradientUnits="userSpaceOnUse" + id="radialGradient3944" + xlink:href="#XMLID_8_" + inkscape:collect="always" /> + <linearGradient + y2="36.313725" + x2="42.708179" + y1="123.58058" + x1="63.109283" + gradientTransform="matrix(1.002688,0,0,1.002688,154.5853,71.015)" + gradientUnits="userSpaceOnUse" + id="linearGradient3895" + xlink:href="#linearGradient2257" + inkscape:collect="always" /> + <linearGradient + y2="84.336159" + x2="61.060928" + y1="67.373436" + x1="61.060928" + gradientTransform="matrix(1.002688,0,0,1.002688,154.5853,71.015)" + gradientUnits="userSpaceOnUse" + id="linearGradient3892" + xlink:href="#linearGradient3194" + inkscape:collect="always" /> + <linearGradient + y2="33.424469" + x2="37.203804" + y1="165.6929" + x1="76.601013" + gradientTransform="matrix(1.002688,0,0,0.298658,154.5853,104.571)" + gradientUnits="userSpaceOnUse" + id="linearGradient3889" + xlink:href="#linearGradient2257" + inkscape:collect="always" /> + <linearGradient + y2="63.31934" + x2="103.77021" + y1="42.13184" + x1="119.58964" + gradientTransform="translate(153.2054,69.33982)" + gradientUnits="userSpaceOnUse" + id="linearGradient3868" + xlink:href="#linearGradient3654" + inkscape:collect="always" /> + <linearGradient + y2="59.734375" + x2="103.28125" + y1="52.859375" + x1="112.39521" + gradientTransform="translate(153.2054,69.33982)" + gradientUnits="userSpaceOnUse" + id="linearGradient3865" + xlink:href="#linearGradient3654" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3654"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3656" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3658" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3272"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3274" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3276" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3194"> + <stop + style="stop-color:#967239;stop-opacity:1;" + offset="0" + id="stop3196" /> + <stop + style="stop-color:#967239;stop-opacity:0;" + offset="1" + id="stop3198" /> + </linearGradient> + <linearGradient + id="linearGradient5242"> + <stop + style="stop-color:#180f00;stop-opacity:1;" + offset="0" + id="stop5244" /> + <stop + style="stop-color:#613e00;stop-opacity:0;" + offset="1" + id="stop5246" /> + </linearGradient> + <linearGradient + id="linearGradient2257"> + <stop + id="stop2259" + offset="0" + style="stop-color:#8f6b32;stop-opacity:1;" /> + <stop + id="stop2261" + offset="1" + style="stop-color:#debc85;stop-opacity:1;" /> + </linearGradient> + <linearGradient + y2="73.116" + x2="71.615" + y1="63.1162" + x1="68.6152" + gradientUnits="userSpaceOnUse" + id="XMLID_103_"> + <stop + id="stop2217" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2219" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="67.3014" + x2="77.0967" + y1="58.3008" + x1="74.0967" + gradientUnits="userSpaceOnUse" + id="XMLID_104_"> + <stop + id="stop2224" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2226" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="63.2474" + x2="84.3804" + y1="53.2485" + x1="80.3809" + gradientUnits="userSpaceOnUse" + id="XMLID_105_"> + <stop + id="stop2231" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2233" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="61.9248" + x2="90.7354" + y1="49.8486" + x1="89.1709" + gradientUnits="userSpaceOnUse" + id="XMLID_106_"> + <stop + id="stop2238" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2240" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="58.8364" + x2="98.8974" + y1="47.8369" + x1="96.8975" + gradientUnits="userSpaceOnUse" + id="XMLID_107_"> + <stop + id="stop2245" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2247" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-0.894 0.4481 0.4481 0.894 102.4965 -24.3783)" + y2="71.4501" + x2="82.7584" + y1="64.792" + x1="81.4268" + gradientUnits="userSpaceOnUse" + id="XMLID_111_"> + <stop + id="stop2273" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2275" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="70.9013" + x2="55.8886" + y1="61.9019" + x1="54.8887" + gradientUnits="userSpaceOnUse" + id="XMLID_112_"> + <stop + id="stop2280" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2282" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-0.5962 0.8028 0.8028 0.5962 60.4483 -34.8312)" + y2="51.5712" + x2="84.3951" + y1="44.9131" + x1="83.0635" + gradientUnits="userSpaceOnUse" + id="XMLID_113_"> + <stop + id="stop2287" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2289" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-0.4243 0.9055 0.9055 0.4243 41.46 -36.3299)" + y2="43.1339" + x2="84.7196" + y1="36.4746" + x1="83.3877" + gradientUnits="userSpaceOnUse" + id="XMLID_114_"> + <stop + id="stop2294" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2296" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-0.2556 0.9668 0.9668 0.2556 25.5372 -35.9141)" + y2="35.1793" + x2="85.3436" + y1="28.52" + x1="84.0117" + gradientUnits="userSpaceOnUse" + id="XMLID_115_"> + <stop + id="stop2301" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2303" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-0.0825 0.9966 0.9966 0.0825 10.3161 -34.5121)" + y2="26.6608" + x2="85.6707" + y1="20.0015" + x1="84.3389" + gradientUnits="userSpaceOnUse" + id="XMLID_116_"> + <stop + id="stop2308" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2310" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="113.3099" + x2="67.8624" + y1="106.6494" + x1="66.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_119_"> + <stop + id="stop2329" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2331" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-1 0 0 1 134 0)" + y2="117.3097" + x2="73.8621" + y1="110.6504" + x1="72.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_120_"> + <stop + id="stop2336" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2338" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="105.3099" + x2="67.8624" + y1="98.6494" + x1="66.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_121_"> + <stop + id="stop2343" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2345" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-1 0 0 1 134 0)" + y2="109.3113" + x2="73.8619" + y1="102.6484" + x1="72.5293" + gradientUnits="userSpaceOnUse" + id="XMLID_122_"> + <stop + id="stop2350" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2352" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="121.3099" + x2="67.8614" + y1="114.6494" + x1="66.5293" + gradientUnits="userSpaceOnUse" + id="XMLID_123_"> + <stop + id="stop2357" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2359" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="89.3099" + x2="67.8624" + y1="82.6494" + x1="66.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_125_"> + <stop + id="stop2371" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2373" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-1 0 0 1 134 0)" + y2="93.3099" + x2="73.8614" + y1="86.6494" + x1="72.5293" + gradientUnits="userSpaceOnUse" + id="XMLID_126_"> + <stop + id="stop2378" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2380" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="81.3101" + x2="67.8616" + y1="74.6484" + x1="66.5293" + gradientUnits="userSpaceOnUse" + id="XMLID_127_"> + <stop + id="stop2385" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2387" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-1 0 0 1 134 0)" + y2="85.3097" + x2="73.8612" + y1="78.6504" + x1="72.5293" + gradientUnits="userSpaceOnUse" + id="XMLID_128_"> + <stop + id="stop2392" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2394" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="97.3099" + x2="67.8624" + y1="90.6494" + x1="66.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_129_"> + <stop + id="stop2399" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2401" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(-1 0 0 1 134 0)" + y2="101.3107" + x2="73.8621" + y1="94.6514" + x1="72.5303" + gradientUnits="userSpaceOnUse" + id="XMLID_130_"> + <stop + id="stop2406" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2408" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0002" + x2="70.1992" + y1="57.9995" + x1="70.1992" + gradientUnits="userSpaceOnUse" + id="XMLID_131_"> + <stop + id="stop2413" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2415" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0007" + x2="75.5947" + y1="58" + x1="75.5947" + gradientUnits="userSpaceOnUse" + id="XMLID_132_"> + <stop + id="stop2420" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2422" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="118.9961" + x2="82.4727" + y1="58" + x1="82.4727" + gradientUnits="userSpaceOnUse" + id="XMLID_133_"> + <stop + id="stop2427" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2429" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="118.9998" + x2="89.8066" + y1="57.9995" + x1="89.8066" + gradientUnits="userSpaceOnUse" + id="XMLID_134_"> + <stop + id="stop2434" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2436" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119" + x2="97.7725" + y1="57.9995" + x1="97.7725" + gradientUnits="userSpaceOnUse" + id="XMLID_135_"> + <stop + id="stop2441" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2443" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0002" + x2="59.3667" + y1="57.9995" + x1="59.3667" + gradientUnits="userSpaceOnUse" + id="XMLID_139_"> + <stop + id="stop2469" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2471" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0003" + x2="55.313" + y1="57.9995" + x1="55.313" + gradientUnits="userSpaceOnUse" + id="XMLID_140_"> + <stop + id="stop2476" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2478" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="118.9997" + x2="48.5864" + y1="57.9995" + x1="48.5864" + gradientUnits="userSpaceOnUse" + id="XMLID_141_"> + <stop + id="stop2483" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2485" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0007" + x2="41.0347" + y1="58" + x1="41.0347" + gradientUnits="userSpaceOnUse" + id="XMLID_142_"> + <stop + id="stop2490" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2492" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0001" + x2="33.7886" + y1="57.9995" + x1="33.7886" + gradientUnits="userSpaceOnUse" + id="XMLID_143_"> + <stop + id="stop2497" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2499" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0007" + x2="25.5942" + y1="58" + x1="25.5942" + gradientUnits="userSpaceOnUse" + id="XMLID_144_"> + <stop + id="stop2504" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2506" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0009" + x2="67" + y1="58.0005" + x1="67" + gradientUnits="userSpaceOnUse" + id="XMLID_147_"> + <stop + id="stop2525" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2527" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="119.0009" + x2="60.9995" + y1="58.0005" + x1="60.9995" + gradientUnits="userSpaceOnUse" + id="XMLID_148_"> + <stop + id="stop2532" + style="stop-color:#EEEEEC" + offset="0.0506" /> + <stop + id="stop2534" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="103.9829" + x2="68.4149" + y1="67.6123" + x1="60.3325" + gradientUnits="userSpaceOnUse" + id="XMLID_159_"> + <stop + id="stop2560" + style="stop-color:#515151;stop-opacity:1;" + offset="0.0506" /> + <stop + id="stop2562" + style="stop-color:#343633;stop-opacity:1;" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#555753" + offset="1" /> + </linearGradient> + <linearGradient + y2="82.8864" + x2="68.8911" + y1="67.8857" + x1="56.8906" + gradientUnits="userSpaceOnUse" + id="XMLID_160_"> + <stop + id="stop2567" + style="stop-color:#FFFFFF" + offset="0" /> + <stop + id="stop2569" + style="stop-color:#373836;stop-opacity:1;" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#555753" + offset="1" /> + </linearGradient> + <linearGradient + y2="83.6237" + x2="67.0498" + y1="69.625" + x1="62.0503" + gradientUnits="userSpaceOnUse" + id="XMLID_161_"> + <stop + id="stop2574" + style="stop-color:#FFFFFF" + offset="0" /> + <stop + id="stop2576" + style="stop-color:#FAFAFA" + offset="0.1332" /> + <stop + id="stop2578" + style="stop-color:#ECEDEC" + offset="0.2876" /> + <stop + id="stop2580" + style="stop-color:#D5D6D5" + offset="0.4525" /> + <stop + id="stop2582" + style="stop-color:#B5B6B4" + offset="0.6249" /> + <stop + id="stop2584" + style="stop-color:#8C8D8A" + offset="0.8032" /> + <stop + id="stop2586" + style="stop-color:#5A5C58" + offset="0.9838" /> + <stop + id="stop2588" + style="stop-color:#555753" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.6765" /> + <a:midPointStop + style="stop-color:#555753" + offset="1" /> + </linearGradient> + <linearGradient + y2="79.093" + x2="64.5422" + y1="74.0918" + x1="63.542" + gradientUnits="userSpaceOnUse" + id="XMLID_162_"> + <stop + id="stop2593" + style="stop-color:#a9ada4;stop-opacity:1;" + offset="0" /> + <stop + id="stop2595" + style="stop-color:#3f403d;stop-opacity:1;" + offset="1" /> + <a:midPointStop + style="stop-color:#BABDB6" + offset="0" /> + <a:midPointStop + style="stop-color:#BABDB6" + offset="0.5" /> + <a:midPointStop + style="stop-color:#555753" + offset="1" /> + </linearGradient> + <linearGradient + y2="101.0992" + x2="68.3162" + y1="83.0986" + x1="61.3159" + gradientUnits="userSpaceOnUse" + id="XMLID_163_"> + <stop + id="stop2600" + style="stop-color:#FFFFFF" + offset="0.0056" /> + <stop + id="stop2602" + style="stop-color:#F0F0F0" + offset="0.1352" /> + <stop + id="stop2604" + style="stop-color:#CACAC9" + offset="0.384" /> + <stop + id="stop2606" + style="stop-color:#8C8D8B" + offset="0.7233" /> + <stop + id="stop2608" + style="stop-color:#555753" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.0056" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5618" /> + <a:midPointStop + style="stop-color:#555753" + offset="1" /> + </linearGradient> + <linearGradient + y2="107.8077" + x2="67.7616" + y1="77.5322" + x1="61.7065" + gradientUnits="userSpaceOnUse" + id="XMLID_164_"> + <stop + id="stop2613" + style="stop-color:#EEEEEC" + offset="0" /> + <stop + id="stop2615" + style="stop-color:#BABDB6" + offset="1" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0" /> + <a:midPointStop + style="stop-color:#EEEEEC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#BABDB6" + offset="1" /> + </linearGradient> + <linearGradient + y2="76" + x2="66" + y1="76" + x1="62" + gradientUnits="userSpaceOnUse" + id="XMLID_165_"> + <stop + id="stop2620" + style="stop-color:#FFFFFF" + offset="0.0506" /> + <stop + id="stop2622" + style="stop-color:#D3D7CF" + offset="0.9326" /> + <stop + id="stop2624" + style="stop-color:#888A85" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D3D7CF" + offset="0.9326" /> + <a:midPointStop + style="stop-color:#D3D7CF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#888A85" + offset="1" /> + </linearGradient> + <linearGradient + y2="80.9765" + x2="65.1059" + y1="71.9766" + x1="63.106" + gradientUnits="userSpaceOnUse" + id="XMLID_166_"> + <stop + id="stop2629" + style="stop-color:#FFFFFF" + offset="0.0506" /> + <stop + id="stop2631" + style="stop-color:#D3D7CF" + offset="1" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.0506" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D3D7CF" + offset="1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="linearGradient3174" + x1="63.109283" + y1="123.58058" + x2="42.708179" + y2="36.313725" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002688,0,0,1.002688,-12.92013,1.675182)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3194" + id="linearGradient3200" + x1="61.060928" + y1="67.373436" + x2="61.060928" + y2="84.336159" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002688,0,0,1.002688,-12.92013,1.675182)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="linearGradient3202" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002688,0,0,0.298658,-12.92013,35.23114)" + x1="76.601013" + y1="165.6929" + x2="37.203804" + y2="33.424469" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3280" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3282" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3284" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3286" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3288" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3290" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient3292" + gradientUnits="userSpaceOnUse" + x1="106.37579" + y1="-8.5763578" + x2="21.697437" + y2="138.35936" /> + <foreignObject + requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" + x="0" + y="0" + width="1" + height="1" + id="foreignObject3305"> + <i:pgfRef + xlink:href="#adobe_illustrator_pgf" /> + </foreignObject> + <radialGradient + id="XMLID_5_" + cx="51.9995" + cy="-9" + r="111.0006" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(18.73145,-130.4544)"> + <stop + offset="0.15" + style="stop-color:#80B3FF" + id="stop3312" /> + <stop + offset="0.316" + style="stop-color:#69A1F0" + id="stop3314" /> + <stop + offset="0.6029" + style="stop-color:#4888DA" + id="stop3316" /> + <stop + offset="0.8412" + style="stop-color:#3378CC" + id="stop3318" /> + <stop + offset="1" + style="stop-color:#2C72C7" + id="stop3320" /> + </radialGradient> + <linearGradient + id="linearGradient3670" + gradientUnits="userSpaceOnUse" + x1="63.9995" + y1="25.1577" + x2="63.9995" + y2="157.6319" + gradientTransform="translate(18.73145,-130.4544)"> + <stop + offset="0" + style="stop-color:#BFD9FF" + id="stop3374" /> + <stop + offset="0.2189" + style="stop-color:#80B3FF" + id="stop3376" /> + <stop + offset="0.2933" + style="stop-color:#6EA5F3" + id="stop3378" /> + <stop + offset="0.4426" + style="stop-color:#3E80D3" + id="stop3380" /> + <stop + offset="0.4941" + style="stop-color:#2C72C7" + id="stop3382" /> + <stop + offset="0.7" + style="stop-color:#00438A" + id="stop3384" /> + </linearGradient> + <linearGradient + id="linearGradient3678" + gradientUnits="userSpaceOnUse" + x1="-37.875" + y1="48.787102" + x2="230.237" + y2="48.787102" + gradientTransform="translate(18.73145,-130.4544)"> + <stop + offset="0" + style="stop-color:#2C72C7" + id="stop3389" /> + <stop + offset="0.2959" + style="stop-color:#FFFFFF" + id="stop3391" /> + <stop + offset="1" + style="stop-color:#2C72C7" + id="stop3393" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_5_" + id="radialGradient3616" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(18.73145,-130.4544)" + cx="51.9995" + cy="-9" + r="111.0006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_7_" + id="linearGradient3618" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(18.73145,-130.4544)" + x1="63.9995" + y1="25.1577" + x2="63.9995" + y2="157.6319" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_8_" + id="linearGradient3620" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(18.73145,-130.4544)" + x1="-37.875" + y1="48.787102" + x2="230.237" + y2="48.787102" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3654" + id="linearGradient3660" + x1="112.39521" + y1="52.859375" + x2="103.28125" + y2="59.734375" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-14.3,0)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3654" + id="linearGradient3662" + x1="119.58964" + y1="42.13184" + x2="103.77021" + y2="63.31934" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-14.3,0)" /> + <linearGradient + id="linearGradient2403"> + <stop + style="stop-color:#28691f;stop-opacity:1;" + offset="0" + id="stop2405" /> + <stop + style="stop-color:#42ad33;stop-opacity:1;" + offset="1" + id="stop2407" /> + </linearGradient> + <linearGradient + id="linearGradient2389"> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0" + id="stop2391" /> + <stop + id="stop2393" + offset="0.4375" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0.56588125" + id="stop2395" /> + <stop + id="stop2423" + offset="0.76237977" + style="stop-color:#000000;stop-opacity:0.24705882;" /> + <stop + id="stop2421" + offset="0.77884614" + style="stop-color:#000000;stop-opacity:0.49803922;" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0.875" + id="stop2397" /> + <stop + id="stop2411" + offset="0.875" + style="stop-color:#000000;stop-opacity:0.49803922;" /> + <stop + id="stop3938" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient2362"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop2364" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop2366" /> + </linearGradient> + <linearGradient + id="linearGradient2321"> + <stop + style="stop-color:#c3c3c3;stop-opacity:1;" + offset="0" + id="stop2323" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop2325" /> + </linearGradient> + <linearGradient + id="linearGradient2287"> + <stop + id="stop2299" + offset="0" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="0.4375" + id="stop2307" /> + <stop + id="stop2309" + offset="0.58240438" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0.49803922;" + offset="0.76442307" + id="stop2419" /> + <stop + id="stop3918" + offset="0.875" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0.49803922;" + offset="0.91826922" + id="stop3920" /> + <stop + id="stop2417" + offset="0.96048182" + style="stop-color:#000000;stop-opacity:0;" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop2291" /> + </linearGradient> + <linearGradient + id="linearGradient3325"> + <stop + id="stop3327" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3329" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3311"> + <stop + style="stop-color:#2d2d2d;stop-opacity:1;" + offset="0" + id="stop3313" /> + <stop + id="stop3319" + offset="0.5" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop1492" /> + </linearGradient> + <linearGradient + id="linearGradient3303"> + <stop + style="stop-color:#ffffff;stop-opacity:0.68345326;" + offset="0" + id="stop3305" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3307" /> + </linearGradient> + <linearGradient + id="linearGradient3273"> + <stop + style="stop-color:#ffffff;stop-opacity:0.55035973;" + offset="0" + id="stop3275" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3277" /> + </linearGradient> + <linearGradient + id="linearGradient3259"> + <stop + id="stop3261" + offset="0" + style="stop-color:#ffffff;stop-opacity:0.55035973;" /> + <stop + id="stop3263" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3251"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3253" /> + <stop + style="stop-color:#131313;stop-opacity:0;" + offset="1" + id="stop3255" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3235"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3237" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3239" /> + </linearGradient> + <linearGradient + id="linearGradient3225"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3227" /> + <stop + style="stop-color:#aeaeae;stop-opacity:1;" + offset="1" + id="stop3229" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3217"> + <stop + style="stop-color:#252525;stop-opacity:1;" + offset="0" + id="stop3219" /> + <stop + style="stop-color:#252525;stop-opacity:0;" + offset="1" + id="stop3221" /> + </linearGradient> + <linearGradient + id="linearGradient3207"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3209" /> + <stop + style="stop-color:#252525;stop-opacity:0;" + offset="1" + id="stop3211" /> + </linearGradient> + <linearGradient + id="linearGradient3876"> + <stop + style="stop-color:#b4942a;stop-opacity:1;" + offset="0" + id="stop3878" /> + <stop + style="stop-color:#e4dcc9;stop-opacity:1" + offset="1" + id="stop3880" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="radialGradient1527" + cx="63.912209" + cy="115.70919" + fx="63.912209" + fy="115.7093" + r="63.912209" + gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="radialGradient1405" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.519831,9.412826e-2,-0.895354,13.78472,115.1882,-1545.166)" + cx="42.617531" + cy="120.64188" + fx="42.617531" + fy="120.64188" + r="3.406888" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3311" + id="radialGradient1407" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.22884e-2,-1.47547e-4,1.889714e-3,0.798624,69.12243,5.487066)" + cx="95.505852" + cy="59.591507" + fx="95.505852" + fy="59.591507" + r="47.746404" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="radialGradient1409" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297066,3.012623e-3,-1.134728e-3,0.488669,7.096503,-13.69501)" + cx="49.009884" + cy="8.4953122" + fx="47.370888" + fy="6.7701697" + r="3.9750405" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3217" + id="linearGradient1411" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-3.693584e-16,3.693584e-16,1.29707,7.064707,-20.57911)" + x1="48.914677" + y1="2.9719031" + x2="48.913002" + y2="2.5548496" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="radialGradient1413" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-4.501275e-16,6.640356e-17,0.1578,7.064707,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3235" + id="linearGradient1415" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297066,3.012623e-3,-3.012623e-3,1.297066,7.112448,-20.56258)" + x1="48.498562" + y1="0.81150496" + x2="48.732723" + y2="2.3657269" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient1417" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.28993,-5.022494e-16,5.050298e-16,1.29707,7.402337,-20.57911)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3273" + id="radialGradient1419" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.860164,-2.800126e-16,6.473209e-17,0.1578,24.75801,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient1421" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.279856,4.983275e-16,-5.050298e-16,1.29707,-133.3868,-20.57911)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3259" + id="radialGradient1423" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.853446,3.872019e-16,-5.817635e-17,0.1578,-116.1668,-17.56653)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3303" + id="radialGradient1425" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,7.573576e-17,-1.374554e-18,2.608014e-2,-7.697455e-14,7.26766)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595197" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3325" + id="radialGradient1427" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595196" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3259" + id="radialGradient1433" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.853446,3.879821e-16,-5.832064e-17,0.1578,-115.9141,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient1436" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.279856,4.994967e-16,-5.062158e-16,1.29707,-133.1341,-10.31269)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3273" + id="radialGradient1439" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.860164,-2.80798e-16,6.487638e-17,0.1578,24.50481,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3251" + id="linearGradient1442" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.28993,-5.034291e-16,5.062158e-16,1.29707,7.14915,-10.31269)" + x1="46.051746" + y1="3.0999987" + x2="46.051746" + y2="2.395859" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3235" + id="linearGradient1445" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297068,-1.880044e-3,1.880044e-3,1.297068,6.796523,-10.3225)" + x1="48.498562" + y1="0.81150496" + x2="48.732723" + y2="2.3657269" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="radialGradient1448" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-4.513135e-16,6.654785e-17,0.1578,6.81152,-7.300115)" + cx="49.011971" + cy="2.6743078" + fx="49.011971" + fy="2.6743078" + r="1.7246193" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3217" + id="linearGradient1451" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.29707,-3.705444e-16,3.705444e-16,1.29707,6.81152,-10.31269)" + x1="48.914677" + y1="2.9719031" + x2="48.913002" + y2="2.5548496" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="radialGradient1455" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.297068,-1.880044e-3,7.085819e-4,0.48867,6.806484,-3.45491)" + cx="49.009884" + cy="8.4953122" + fx="47.370888" + fy="6.7701697" + r="3.9750405" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3311" + id="radialGradient1462" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.228741e-2,-3.825032e-4,4.90218e-3,0.798611,68.90433,5.49306)" + cx="95.505852" + cy="59.591507" + fx="95.505852" + fy="59.591507" + r="47.746404" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2257" + id="radialGradient1466" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.520175,8.839467e-2,-0.843351,13.788,109.1206,-1545.323)" + cx="42.617531" + cy="120.64188" + fx="42.617531" + fy="120.64188" + r="3.406888" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3325" + id="radialGradient1470" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" + cx="34.677639" + cy="7.4622769" + fx="34.677639" + fy="7.4622769" + r="47.595196" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2362" + id="linearGradient2368" + x1="74.332748" + y1="17.912012" + x2="54.983063" + y2="90.126022" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.180422,0,0,1.180422,-10.39088,-10.58642)" /> + <linearGradient + id="linearGradient7281"> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000" + offset="0.0000000" + id="stop7283" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.0000000" + offset="1.0000000" + id="stop7285" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="radialGradient4000" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" + cx="63.912209" + cy="115.70919" + fx="63.912209" + fy="115.7093" + r="63.912209" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2287" + id="radialGradient4022" + gradientUnits="userSpaceOnUse" + cx="95.796135" + cy="56.931728" + fx="95.990845" + fy="39.602753" + r="47.11924" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="radialGradient4024" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" + cx="63.912209" + cy="115.70919" + fx="63.912209" + fy="115.7093" + r="63.912209" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2321" + id="linearGradient4026" + gradientUnits="userSpaceOnUse" + x1="-42.789177" + y1="82.913582" + x2="229.1772" + y2="81.155327" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2389" + id="radialGradient4028" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.165294,0,0,1.180294,-9.816118,-9.597466)" + cx="59.385818" + cy="52.046673" + fx="59.385818" + fy="52.046673" + r="43.225086" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2403" + id="linearGradient4030" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.065955,0,0,1.065955,-4.218613,-1.697485)" + x1="97.124756" + y1="99.590462" + x2="33.355057" + y2="22.203432" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2362" + id="linearGradient4032" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.258277,0,0,1.258277,-15.29483,-12.98214)" + x1="74.514832" + y1="17.232468" + x2="52.587749" + y2="99.06546" /> + <linearGradient + y2="88.207977" + x2="48.083496" + y1="-90.602264" + x1="118.66905" + gradientTransform="translate(-5.417988,-3.386244)" + gradientUnits="userSpaceOnUse" + id="linearGradient3137" + xlink:href="#linearGradient3061" + inkscape:collect="always" /> + <radialGradient + gradientTransform="matrix(1.49967,0,0,1.49967,-37.73576,-32.15645)" + gradientUnits="userSpaceOnUse" + r="165.9342" + cy="114" + cx="112.667" + id="XMLID_8_"> + <stop + id="stop54" + style="stop-color:#888A85" + offset="0.0056" /> + <stop + id="stop56" + style="stop-color:#EEEEEC" + offset="1" /> + </radialGradient> + <radialGradient + gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" + gradientUnits="userSpaceOnUse" + r="165.9343" + cy="114" + cx="113.0986" + id="XMLID_9_"> + <stop + id="stop63" + style="stop-color:#888A85" + offset="0.0056" /> + <stop + id="stop65" + style="stop-color:#EEEEEC" + offset="1" /> + </radialGradient> + <radialGradient + gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" + gradientUnits="userSpaceOnUse" + r="165.9342" + cy="114" + cx="110.4854" + id="XMLID_10_"> + <stop + id="stop72" + style="stop-color:#888A85" + offset="0.0056" /> + <stop + id="stop74" + style="stop-color:#EEEEEC" + offset="1" /> + </radialGradient> + <radialGradient + spreadMethod="reflect" + r="28.118999" + fy="58.278419" + fx="70.758911" + cy="78.297623" + cx="57.985786" + gradientTransform="matrix(1.057844,0.272492,-0.841932,3.268475,46.39208,-183.0869)" + gradientUnits="userSpaceOnUse" + id="radialGradient3119" + xlink:href="#linearGradient3044" + inkscape:collect="always" /> + <radialGradient + gradientUnits="userSpaceOnUse" + r="164.7558" + cy="121" + cx="98" + id="XMLID_11_"> + <stop + id="stop81" + style="stop-color:#00438A" + offset="0" /> + <stop + id="stop83" + style="stop-color:#04468C" + offset="0.0429" /> + <stop + id="stop85" + style="stop-color:#0E4E92" + offset="0.0808" /> + <stop + id="stop87" + style="stop-color:#205C9C" + offset="0.1168" /> + <stop + id="stop89" + style="stop-color:#3A6FAA" + offset="0.1517" /> + <stop + id="stop91" + style="stop-color:#5B88BC" + offset="0.1858" /> + <stop + id="stop93" + style="stop-color:#82A6D2" + offset="0.2188" /> + <stop + id="stop95" + style="stop-color:#A4C0E4" + offset="0.2426" /> + <stop + id="stop97" + style="stop-color:#00438A" + offset="1" /> + </radialGradient> + <linearGradient + y2="105.4987" + x2="95.420601" + y1="95.725601" + x1="85.647499" + gradientUnits="userSpaceOnUse" + id="XMLID_12_"> + <stop + id="stop102" + style="stop-color:#FFFFFF" + offset="0.3" /> + <stop + id="stop104" + style="stop-color:#EEEEEE" + offset="0.6036" /> + <stop + id="stop106" + style="stop-color:#CDCDCD" + offset="0.7479" /> + <stop + id="stop108" + style="stop-color:#BBBBBB" + offset="0.8462" /> + <stop + id="stop110" + style="stop-color:#C5C5C5" + offset="0.8763" /> + <stop + id="stop112" + style="stop-color:#D7D7D7" + offset="0.9482" /> + <stop + id="stop114" + style="stop-color:#DDDDDD" + offset="1" /> + </linearGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + r="137.8933" + cy="111.1299" + cx="101.1562" + id="XMLID_7_"> + <stop + id="stop22" + style="stop-color:#555555" + offset="0.1006" /> + <stop + id="stop24" + style="stop-color:#676767" + offset="0.115" /> + <stop + id="stop26" + style="stop-color:#9B9B9B" + offset="0.1614" /> + <stop + id="stop28" + style="stop-color:#C0C0C0" + offset="0.2018" /> + <stop + id="stop30" + style="stop-color:#D8D8D8" + offset="0.2341" /> + <stop + id="stop32" + style="stop-color:#E0E0E0" + offset="0.2544" /> + <stop + id="stop34" + style="stop-color:#EDEDED" + offset="0.3115" /> + <stop + id="stop36" + style="stop-color:#FAFAFA" + offset="0.4005" /> + <stop + id="stop38" + style="stop-color:#FFFFFF" + offset="0.4793" /> + <stop + id="stop40" + style="stop-color:#FAFAFA" + offset="0.5997" /> + <stop + id="stop42" + style="stop-color:#EEEEEE" + offset="0.7219" /> + <stop + id="stop44" + style="stop-color:#DDDDDD" + offset="0.8876" /> + </radialGradient> + <foreignObject + requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" + x="0" + y="0" + width="1" + height="1" + id="foreignObject7"> + <i:pgfRef + xlink:href="#adobe_illustrator_pgf" /> + </foreignObject> + <linearGradient + id="linearGradient3044"> + <stop + id="stop3046" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop3048" + offset="1" + style="stop-color:#5f5f5f;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3061" + inkscape:collect="always"> + <stop + id="stop3063" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3065" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <inkscape:perspective + id="perspective9450" + inkscape:persp3d-origin="64 : 42.666667 : 1" + inkscape:vp_z="128 : 64 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 64 : 1" + sodipodi:type="inkscape:persp3d" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_9_" + id="radialGradient10528" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" + cx="113.0986" + cy="114" + r="165.9343" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_10_" + id="radialGradient10530" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" + cx="110.4854" + cy="114" + r="165.9342" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10532" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="linearGradient10536" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.99999,239.1304)" + x1="79.75" + y1="84" + x2="120.25" + y2="84" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10539" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.30236,239.1304)" + x1="26.697636" + y1="96" + x2="14.697635" + y2="72" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10542" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.30236,239.1304)" + x1="6.6976352" + y1="52" + x2="11.68106" + y2="96.001434" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient10545" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.3125,239.1304)" + x1="11.68106" + y1="60.539303" + x2="11.68106" + y2="108.0104" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient10548" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + cx="-44" + cy="84" + fx="-40" + fy="96" + r="20" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3030" + id="radialGradient10552" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + cx="-44" + cy="84" + fx="-60" + fy="100" + r="24" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient10561" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + x1="-13.757333" + y1="76.708466" + x2="-62.424866" + y2="104.80668" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5412" + id="linearGradient10567" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="linearGradient10569" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.039383,0.9621093)" + x1="64.341991" + y1="18.50366" + x2="76.284438" + y2="18.50366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="linearGradient10588" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + x1="-13.757333" + y1="76.708466" + x2="-62.424866" + y2="104.80668" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10590" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10592" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5412" + id="linearGradient10594" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3207" + id="linearGradient10596" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.039383,0.9621093)" + x1="64.341991" + y1="18.50366" + x2="76.284438" + y2="18.50366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10598" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3030" + id="radialGradient10600" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + cx="-44" + cy="84" + fx="-60" + fy="100" + r="24" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10602" + gradientUnits="userSpaceOnUse" + spreadMethod="reflect" + x1="73.742638" + y1="15.336544" + x2="80" + y2="19.281664" /> + <radialGradient + inkscape:collect="always" + xlink:href="#XMLID_4_" + id="radialGradient10604" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(292,239.1304)" + cx="-44" + cy="84" + fx="-40" + fy="96" + r="20" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3272" + id="linearGradient10606" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.3125,239.1304)" + x1="11.68106" + y1="60.539303" + x2="11.68106" + y2="108.0104" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10608" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.30236,239.1304)" + x1="6.6976352" + y1="52" + x2="11.68106" + y2="96.001434" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3260" + id="linearGradient10610" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(229.30236,239.1304)" + x1="26.697636" + y1="96" + x2="14.697635" + y2="72" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3225" + id="linearGradient10612" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(147.99999,239.1304)" + x1="79.75" + y1="84" + x2="120.25" + y2="84" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3291" + id="linearGradient10614" + gradientUnits="userSpaceOnUse" + x1="64" + y1="83.729706" + x2="64" + y2="-62.169582" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3186" + id="linearGradient10616" + gradientUnits="userSpaceOnUse" + x1="64" + y1="24" + x2="64" + y2="-52" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3283" + id="radialGradient10618" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(23,-10e-7,6.1024648e-7,14.035669,-1452,156.4281)" + spreadMethod="reflect" + cx="66" + cy="-10.851176" + fx="66" + fy="-10.851176" + r="2" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="4" + inkscape:cx="84.275956" + inkscape:cy="35.648755" + inkscape:document-units="px" + inkscape:current-layer="g10573" + showgrid="false" + inkscape:snap-bbox="true" + inkscape:window-width="1680" + inkscape:window-height="997" + inkscape:window-x="-4" + inkscape:window-y="30" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid2383" + visible="true" + enabled="true" + spacingx="4px" + spacingy="4px" + empspacing="2" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g3346" + transform="matrix(-0.7071068,-0.7071067,-0.7071067,0.7071068,157.92387,65.414211)" + mask="url(#mask3495)"> + <g + id="g3281"> + <rect + style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient3357);stroke-width:11.22497177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3238)" + id="rect3224" + width="28" + height="84" + x="50" + y="22" + rx="14" + ry="14" + transform="matrix(1.1428572,0,0,1,-7.1428595,0)" /> + <rect + style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3359);stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect2433" + width="32" + height="84" + x="50.000004" + y="22" + rx="16" + ry="16" /> + <rect + ry="16" + rx="16" + y="22" + x="50.000004" + height="84" + width="32" + id="rect3218" + style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3361);stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <g + transform="translate(0,4)" + id="g3276"> + <rect + style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient10614);stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3272)" + id="rect3256" + width="4" + height="88" + x="64" + y="-56" + rx="2" + ry="2" /> + <rect + style="opacity:1;fill:url(#linearGradient10616);fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3246" + width="4" + height="88" + x="64" + y="-56" + rx="2" + ry="2" /> + <rect + ry="2" + rx="2" + y="-56" + x="64" + height="88" + width="4" + id="rect3250" + style="opacity:1;fill:url(#radialGradient10618);fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + <use + height="128" + width="128" + transform="translate(0,144)" + id="use3296" + xlink:href="#g3276" + y="0" + x="0" /> + </g> + <g + id="g10573" + transform="translate(-144,-219.13041)"> + <path + sodipodi:nodetypes="cccccc" + transform="matrix(-0.5,0,0,0.5,280,293.48957)" + id="path3091" + d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" + style="fill:url(#linearGradient10590);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" + clip-path="none" /> + <path + style="fill:url(#linearGradient10592);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" + d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.172686,21.789699 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" + id="path3095" + transform="matrix(0.5,0,0,0.5,216.35562,293.48957)" + sodipodi:nodetypes="cccccc" + clip-path="none" /> + <path + sodipodi:nodetypes="cccccc" + transform="matrix(0.5,0,0,0.5,232.35562,309.10161)" + id="path3221" + d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" + style="opacity:0.55056176;fill:url(#linearGradient10598);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" + clip-path="none" /> + <path + style="opacity:0.55056176;fill:url(#linearGradient10602);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" + d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" + id="path3217" + transform="matrix(-0.5,0,0,0.5,263.64437,309.10161)" + sodipodi:nodetypes="cccccc" + clip-path="none" /> + </g> + </g> +</svg> diff --git a/resources/images/plugboard.png b/resources/images/plugboard.png index 88f0869b8d9de4552184308b934889c5c83ec85f..345fa6440e612468ad76b3e3fa5bf07c89f18250 100644 GIT binary patch literal 3694 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 literal 31806 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 diff --git a/resources/recipes/popscience.recipe b/resources/recipes/popscience.recipe index 5f66d048a6..fe4a9588fc 100644 --- a/resources/recipes/popscience.recipe +++ b/resources/recipes/popscience.recipe @@ -31,7 +31,6 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe): #The following will get read of the Gallery: links when found def preprocess_html(self, soup) : - print 'SOUP IS: ', soup weblinks = soup.findAll(['head','h2']) if weblinks is not None: for link in weblinks: From aa410bcdef8223a88e638cd8b1b0844954f8371a Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 15:33:44 -0600 Subject: [PATCH 195/235] ... --- src/calibre/gui2/dialogs/metadata_single.ui | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/calibre/gui2/dialogs/metadata_single.ui b/src/calibre/gui2/dialogs/metadata_single.ui index dbf825e706..18bcf2dc4c 100644 --- a/src/calibre/gui2/dialogs/metadata_single.ui +++ b/src/calibre/gui2/dialogs/metadata_single.ui @@ -630,10 +630,16 @@ Using this button to create author sort will change author sort from red to gree <property name="toolTip"> <string>Remove border (if any) from cover</string> </property> + <property name="text"> + <string>T&rim</string> + </property> <property name="icon"> <iconset resource="../../../../resources/images.qrc"> <normaloff>:/images/trim.png</normaloff>:/images/trim.png</iconset> </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextBesideIcon</enum> + </property> </widget> </item> <item> From 6bad744fac647a22b9c703907c7999f2882a4a05 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 16:02:13 -0600 Subject: [PATCH 196/235] Fix regression taht broke fetching metadata from isbndb.com --- src/calibre/ebooks/metadata/isbndb.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py index b5fc5830c8..6c321bf9d3 100644 --- a/src/calibre/ebooks/metadata/isbndb.py +++ b/src/calibre/ebooks/metadata/isbndb.py @@ -47,10 +47,10 @@ class ISBNDBMetadata(Metadata): def __init__(self, book): Metadata.__init__(self, None, []) - self.isbn = book.get('isbn13', book.get('isbn')) - self.title = book.find('titlelong').string + self.isbn = unicode(book.get('isbn13', book.get('isbn'))) + self.title = unicode(book.find('titlelong').string) if not self.title: - self.title = book.find('title').string + self.title = unicode(book.find('title').string) self.title = unicode(self.title).strip() au = unicode(book.find('authorstext').string).strip() temp = au.split(',') @@ -65,11 +65,11 @@ class ISBNDBMetadata(Metadata): self.author_sort = None except: pass - self.publisher = book.find('publishertext').string + self.publisher = unicode(book.find('publishertext').string) summ = book.find('summary') if summ and hasattr(summ, 'string') and summ.string: - self.comments = 'SUMMARY:\n'+summ.string + self.comments = 'SUMMARY:\n'+unicode(summ.string) def build_isbn(base_url, opts): From 1df5b8d08a3ee559596b1de340b1b6e813bb92e5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 16:06:45 -0600 Subject: [PATCH 197/235] Suspend metadata backup thread whe bulk downloaing metadata --- src/calibre/gui2/actions/edit_metadata.py | 31 +++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 17c6da9a4c..851528f2e0 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -84,7 +84,8 @@ class EditMetadataAction(InterfaceAction): def do_download_metadata(self, ids, covers=True, set_metadata=True, set_social_metadata=None): - db = self.gui.library_view.model().db + m = self.gui.library_view.model() + db = m.db if set_social_metadata is None: get_social_metadata = config['get_social_metadata'] else: @@ -93,18 +94,22 @@ class EditMetadataAction(InterfaceAction): self._download_book_metadata = DownloadMetadata(db, ids, get_covers=covers, set_metadata=set_metadata, get_social_metadata=get_social_metadata) - self._download_book_metadata.start() - if set_social_metadata is not None and set_social_metadata: - x = _('social metadata') - else: - x = _('covers') if covers and not set_metadata else _('metadata') - self._book_metadata_download_check = QTimer(self.gui) - self._book_metadata_download_check.timeout.connect(self.book_metadata_download_check, - type=Qt.QueuedConnection) - self._book_metadata_download_check.start(100) - self._bb_dialog = BlockingBusy(_('Downloading %s for %d book(s)')%(x, - len(ids)), parent=self.gui) - self._bb_dialog.exec_() + m.stop_metadata_backup() + try: + self._download_book_metadata.start() + if set_social_metadata is not None and set_social_metadata: + x = _('social metadata') + else: + x = _('covers') if covers and not set_metadata else _('metadata') + self._book_metadata_download_check = QTimer(self.gui) + self._book_metadata_download_check.timeout.connect(self.book_metadata_download_check, + type=Qt.QueuedConnection) + self._book_metadata_download_check.start(100) + self._bb_dialog = BlockingBusy(_('Downloading %s for %d book(s)')%(x, + len(ids)), parent=self.gui) + self._bb_dialog.exec_() + finally: + m.start_metadata_backup() def book_metadata_download_check(self): if self._download_book_metadata.is_alive(): From 9ddd785824d73ffc187e00bf9cd0c7594f5735ef Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 16:33:10 -0600 Subject: [PATCH 198/235] Fix #7007 (Updated recipe for Peter schiff economic comentary) --- resources/recipes/peterschiff.recipe | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/resources/recipes/peterschiff.recipe b/resources/recipes/peterschiff.recipe index 882dabc43b..842da7f733 100644 --- a/resources/recipes/peterschiff.recipe +++ b/resources/recipes/peterschiff.recipe @@ -12,15 +12,18 @@ class PeterSchiff(BasicNewsRecipe): description = 'Economic commentary' publisher = 'Euro Pacific capital' category = 'news, politics, economy, USA' - oldest_article = 15 + oldest_article = 25 max_articles_per_feed = 200 no_stylesheets = True - encoding = 'cp1252' + encoding = 'utf8' use_embedded_content = False language = 'en' - country = 'US' remove_empty_feeds = True - extra_css = ' body{font-family: Verdana,Times,serif } h1{text-align: left} img{margin-bottom: 0.4em} ' + extra_css = """ + body{font-family: Verdana,Times,serif } + .field-field-commentary-writer-name{font-weight: bold} + .field-items{display: inline} + """ conversion_options = { 'comment' : description @@ -30,7 +33,15 @@ class PeterSchiff(BasicNewsRecipe): , 'linearize_tables' : True } - keep_only_tags = [dict(name='tr',attrs={'style':'vertical-align: top;'})] + keep_only_tags = [ + dict(name='h2',attrs={'id':'page-title'}) + ,dict(name='div',attrs={'class':'node'}) + ] + remove_tags = [ + dict(name=['meta','link','base','iframe','embed']) + ,dict(attrs={'id':'text-zoom'}) + ] + remove_attributes=['track','linktype','lang'] feeds = [(u'Articles', u'http://feeds.feedburner.com/PeterSchiffsEconomicCommentary')] From c02cee6e8bff7749bb6458ad9c5dab5fae7b1a31 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Wed, 29 Sep 2010 23:59:27 +0100 Subject: [PATCH 199/235] Some plugboard fixes --- src/calibre/ebooks/metadata/book/base.py | 24 ++++++++++++----------- src/calibre/gui2/device.py | 2 +- src/calibre/gui2/preferences/plugboard.py | 20 ++++++------------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 17aa2d5603..a826ae2500 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -295,24 +295,26 @@ class Metadata(object): _data = object.__getattribute__(self, '_data') _data['user_metadata'][field] = metadata - def template_to_attribute(self, other, attrs): + def template_to_attribute(self, other, ops): ''' - Takes a dict {src:dest, src:dest}, evaluates the template in the context - of other, then copies the result to self[dest]. This is on a best- - efforts basis. Some assignments can make no sense. + Takes a list [(src,dest), (src,dest)], evaluates the template in the + context of other, then copies the result to self[dest]. This is on a + best-efforts basis. Some assignments can make no sense. ''' - if not attrs: + if not ops: return - for src in attrs: + for op in ops: try: + src = op[0] + dest = op[1] val = composite_formatter.safe_format\ (src, other, 'PLUGBOARD TEMPLATE ERROR', other) - dfm = self.metadata_for_field(attrs[src]) - if dfm and dfm['is_multiple']: - self.set(attrs[src], - [f.strip() for f in val.split(',') if f.strip()]) + if dest == 'tags': + self.set(dest, [f.strip() for f in val.split(',') if f.strip()]) + elif dest == 'authors': + self.set(dest, [val]) else: - self.set(attrs[src], val) + self.set(dest, val) except: traceback.print_exc() pass diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 3da4fddb5d..254c62e48c 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -334,7 +334,7 @@ class DeviceManager(Thread): # {{{ if cpb is not None: if dev_name in cpb: cpb = cpb[dev_name] - elif plugboard_any_device_value in plugboards[ext]: + elif plugboard_any_device_value in cpb: cpb = cpb[plugboard_any_device_value] else: cpb = None diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 3742eb24d0..97af1563e2 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -57,12 +57,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.formats.insert(1, plugboard_any_format_value) self.new_format.addItems(self.formats) - self.source_fields = [''] - for f in self.db.custom_field_keys(): - if self.db.field_metadata[f]['datatype'] == 'composite': - self.source_fields.append(f) - self.source_fields.sort(cmp=field_cmp) - self.dest_fields = ['', 'authors', 'author_sort', 'language', 'publisher', 'tags', 'title', 'title_sort'] @@ -128,8 +122,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): print 'edit_device_changed: none device!' return self.set_fields() - for i,src in enumerate(dpb): - self.set_field(i, src, dpb[src]) + for i,op in enumerate(dpb): + self.set_field(i, op[0], op[1]) self.ok_button.setEnabled(True) self.del_button.setEnabled(True) @@ -164,7 +158,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): # user specified any format. for f in self.current_plugboards: devs = set(self.current_plugboards[f]) - print 'check', self.current_format, devs if self.current_device != plugboard_save_to_disk_value and \ plugboard_any_device_value in devs: # specific format/any device in list. conflict. @@ -216,7 +209,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.new_device.setCurrentIndex(0) def ok_clicked(self): - pb = {} + pb = [] for i in range(0, len(self.source_widgets)): s = unicode(self.source_widgets[i].text()) if s: @@ -229,13 +222,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): '<p>'+_('The template %s is invalid:')%s + \ '<br>'+str(err), show=True) return - pb[s] = self.dest_fields[d] + pb.append((s, self.dest_fields[d])) else: error_dialog(self, _('Invalid destination'), '<p>'+_('The destination field cannot be blank'), show=True) return - if len(pb) == 0: if self.current_format in self.current_plugboards: fpb = self.current_plugboards[self.current_format] @@ -282,8 +274,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): continue ops = [] for op in self.current_plugboards[f][d]: - ops.append(op + '->' + self.current_plugboards[f][d][op]) - txt += '%s:%s [%s]\n'%(f, d, ', '.join(ops)) + ops.append('[' + op[0] + '] -> ' + op[1]) + txt += '%s:%s %s\n'%(f, d, ', '.join(ops)) self.existing_plugboards.setPlainText(txt) def restore_defaults(self): From 59d509065479e1f915d178a7bfe80deb6c5234b7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 30 Sep 2010 00:10:58 +0100 Subject: [PATCH 200/235] Make author fields splittable, so multiple authors can be used. --- src/calibre/ebooks/metadata/book/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index a826ae2500..be597b2327 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -312,7 +312,7 @@ class Metadata(object): if dest == 'tags': self.set(dest, [f.strip() for f in val.split(',') if f.strip()]) elif dest == 'authors': - self.set(dest, [val]) + self.set(dest, [f.strip() for f in val.split('|') if f.strip()]) else: self.set(dest, val) except: From 55703f26a9aa19a13dad2d8071b61a62db7c6a8d Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 17:25:59 -0600 Subject: [PATCH 201/235] ... --- imgsrc/plugboard.svg | 7401 +------------------------------- resources/images/plugboard.png | Bin 3694 -> 13054 bytes src/calibre/gui2/metadata.py | 3 +- 3 files changed, 224 insertions(+), 7180 deletions(-) diff --git a/imgsrc/plugboard.svg b/imgsrc/plugboard.svg index 9aa0996193..b8451a6b3a 100644 --- a/imgsrc/plugboard.svg +++ b/imgsrc/plugboard.svg @@ -2,8 +2,6 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" - xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" @@ -12,7123 +10,122 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="128" - height="128" + width="128.00171" + height="128.00175" id="svg2" sodipodi:version="0.32" inkscape:version="0.48.0 r9654" - version="1.0" sodipodi:docname="plugboard.svg" - inkscape:output_extension="org.inkscape.output.svgz.inkscape" - inkscape:export-filename="/home/kovid/work/custom/resources/images/plugboard.png" - inkscape:export-xdpi="33.75" - inkscape:export-ydpi="33.75"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="C:\Dokumente und Einstellungen\Appel\Desktop\PlugboardIcon\plugboard2.png" + inkscape:export-xdpi="72.0466" + inkscape:export-ydpi="72.0466" + version="1.1"> <defs id="defs4"> <linearGradient - id="linearGradient3487"> + id="linearGradient3176"> <stop - style="stop-color:#ffffff;stop-opacity:1" + style="stop-color:#3a78be;stop-opacity:1;" offset="0" - id="stop3489" /> - <stop - id="stop3491" - offset="0.5" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:0" - offset="1" - id="stop3493" /> - </linearGradient> - <linearGradient - id="linearGradient3463"> - <stop - id="stop3465" - offset="0" - style="stop-color:#ffffff;stop-opacity:1" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0.60000002" - id="stop3467" /> - <stop - id="stop3469" - offset="1" - style="stop-color:#000000;stop-opacity:0" /> - </linearGradient> - <linearGradient - id="linearGradient3397"> - <stop - style="stop-color:#ffffff;stop-opacity:1" - offset="0" - id="stop3399" /> - <stop - id="stop3459" - offset="0.5" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:0" - offset="1" - id="stop3401" /> - </linearGradient> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="6.1230318e-14 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective10" /> - <radialGradient - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.3744819,0,0,1.1757664,-151.96684,-17.48331)" - r="28" - fy="44.202766" - fx="64" - cy="44.202766" - cx="64" - id="radialGradient3154" - xlink:href="#linearGradient3283" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.9253496,0,0,1.7548297,-59.222375,-41.365268)" - r="32" - fy="60.100002" - fx="64" - cy="60.100002" - cx="64" - id="radialGradient3148" - xlink:href="#linearGradient3291" - inkscape:collect="always" /> - <radialGradient - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.4816064,0,0,2.7355372,-126.87532,-60.950005)" - r="22" - fy="44" - fx="46" - cy="44" - cx="46" - id="radialGradient3297" - xlink:href="#linearGradient3291" - inkscape:collect="always" /> - <radialGradient - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.5117052,0,0,2.2794231,-299.73902,-15.940307)" - r="18" - fy="26.616402" - fx="45.310146" - cy="26.616402" - cx="45.310146" - id="radialGradient3289" - xlink:href="#linearGradient3283" - inkscape:collect="always" /> - <linearGradient - gradientTransform="matrix(2.2279695,0,0,1.9948165,-36.751288,-17.216948)" - spreadMethod="pad" - gradientUnits="userSpaceOnUse" - y2="16.733448" - x2="28" - y1="66.467087" - x1="28" - id="linearGradient3192" - xlink:href="#linearGradient3186" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3186" - inkscape:collect="always"> - <stop - id="stop3188" - offset="0" - style="stop-color:#c8c8c8;stop-opacity:1" /> - <stop - id="stop3190" - offset="1" - style="stop-color:#e4e4e4;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient3283" - inkscape:collect="always"> - <stop - id="stop3285" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop3287" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3291"> - <stop - id="stop3293" - offset="0" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - id="stop3295" - offset="1" - style="stop-color:#7c7c7c;stop-opacity:1;" /> - </linearGradient> - <inkscape:perspective - id="perspective2409" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient3208" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.3744819,0,0,1.1757664,-11.96684,-17.583312)" - spreadMethod="reflect" - cx="64" - cy="44.202766" - fx="64" - fy="44.202766" - r="28" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient3211" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.2279695,0,0,1.9948165,83.248712,-17.31695)" - spreadMethod="pad" - x1="28" - y1="66.467087" - x2="28" - y2="16.733448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient3214" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.9253496,0,0,1.7548297,60.777625,-41.46527)" - cx="64" - cy="60.100002" - fx="64" - fy="60.100002" - r="32" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient3216" - x1="64" - y1="100" - x2="64" - y2="28" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1428572,0,0,1,-7.1428578,0)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient3222" - cx="64" - cy="54.400002" - fx="64" - fy="54.400002" - r="16" - gradientTransform="matrix(7.7142861,0,0,1.7500001,-427.71431,-43.200007)" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" /> - <filter - inkscape:collect="always" - id="filter3238"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.36" - id="feGaussianBlur3240" /> - </filter> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="linearGradient3244" - x1="70" - y1="127" - x2="70" - y2="32.952141" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient3248" - x1="64" - y1="24" - x2="64" - y2="-52" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient3254" - cx="66" - cy="-10.851176" - fx="66" - fy="-10.851176" - r="2" - gradientTransform="matrix(23,-1e-6,6.1024648e-7,14.035669,-1452,156.4281)" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="linearGradient3258" - x1="64" - y1="83.729706" - x2="64" - y2="-62.169582" - gradientUnits="userSpaceOnUse" /> - <filter - inkscape:collect="always" - id="filter3272" - x="-0.174" - width="1.348" - y="-0.02784" - height="1.05568"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.16" - id="feGaussianBlur3274" /> - </filter> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="linearGradient3340" - gradientUnits="userSpaceOnUse" - x1="64" - y1="83.729706" - x2="64" - y2="-62.169582" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient3342" - gradientUnits="userSpaceOnUse" - x1="64" - y1="24" - x2="64" - y2="-52" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient3344" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(23,-1e-6,6.1024648e-7,14.035669,-1452,156.4281)" - spreadMethod="reflect" - cx="66" - cy="-10.851176" - fx="66" - fy="-10.851176" - r="2" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="linearGradient3357" - gradientUnits="userSpaceOnUse" - x1="70" - y1="127" - x2="70" - y2="32.952141" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient3359" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1428572,0,0,1,-7.1428578,0)" - x1="64" - y1="100" - x2="64" - y2="28" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient3361" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(7.7142861,0,0,1.7500001,-427.71431,-43.200007)" - spreadMethod="reflect" - cx="64" - cy="54.400002" - fx="64" - fy="54.400002" - r="16" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3397" - id="radialGradient3403" - cx="64" - cy="64" - fx="64" - fy="64" - r="64" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4225932,0,0,1.4225932,-27.045963,-27.045963)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3463" - id="radialGradient3461" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.4225932,0,0,1.4225932,-27.045963,-27.045963)" - cx="64" - cy="64" - fx="64" - fy="64" - r="64" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3463" - id="radialGradient3477" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.7782415,0,0,1.7782415,-49.807454,-49.807454)" - cx="64" - cy="64" - fx="64" - fy="64" - r="64" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3487" - id="radialGradient3485" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.7782415,0,0,1.7782415,-49.807454,-49.807454)" - cx="64" - cy="64" - fx="64" - fy="64" - r="64" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3487" - id="radialGradient3499" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.7782416,0,0,1.7782416,-23.883571,-115.22167)" - cx="64" - cy="64" - fx="64" - fy="64" - r="64" /> - <mask - maskUnits="userSpaceOnUse" - id="mask3495"> - <rect - style="opacity:0.6;fill:url(#radialGradient3499);fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3497" - width="160" - height="160" - x="9.9238844" - y="-81.414215" - transform="matrix(0.7071068,0.7071067,-0.7071067,0.7071068,0,0)" /> - </mask> - <radialGradient - r="16.25" - fy="433.70554" - fx="311.27777" - cy="431.38034" - cx="312" - gradientTransform="matrix(0.696437,0,0,1.188967,1.10853,-411.55486)" - gradientUnits="userSpaceOnUse" - id="radialGradient4500" - xlink:href="#linearGradient3654" - inkscape:collect="always" /> - <radialGradient - r="16.25" - fy="433.70554" - fx="311.27777" - cy="431.38034" - cx="312" - gradientTransform="matrix(-0.696437,0,0,1.188967,461.84022,-411.55486)" - gradientUnits="userSpaceOnUse" - id="radialGradient4497" - xlink:href="#linearGradient3654" - inkscape:collect="always" /> - <radialGradient - r="22.444886" - fy="392.75388" - fx="330.04404" - cy="396.09259" - cx="324.39757" - gradientTransform="matrix(1.0059645,0,0,1.4472234,-95.24398,-507.86463)" - gradientUnits="userSpaceOnUse" - id="radialGradient4493" - xlink:href="#linearGradient3149" - inkscape:collect="always" /> - <radialGradient - r="22.779817" - fy="369.61789" - fx="332.49338" - cy="369.61789" - cx="332.49338" - gradientTransform="matrix(-0.7020433,-0.1106778,8.3859807e-2,-0.5312371,441.44118,274.73245)" - gradientUnits="userSpaceOnUse" - id="radialGradient4484" - xlink:href="#linearGradient3368" - inkscape:collect="always" /> - <linearGradient - y2="426.80276" - x2="325.29688" - y1="481.87405" - x1="325.29688" - gradientTransform="matrix(1.0059645,0,0,1.0053055,-95.46406,-332.79275)" - gradientUnits="userSpaceOnUse" - id="linearGradient4477" - xlink:href="#linearGradient3397" - inkscape:collect="always" /> - <linearGradient - y2="104.80668" - x2="-62.424866" - y1="76.708466" - x1="-13.757333" - gradientTransform="translate(144.36675,15.9547)" - gradientUnits="userSpaceOnUse" - id="linearGradient4464" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - r="24" - fy="100" - fx="-60" - cy="84" - cx="-44" - gradientTransform="translate(144.36675,15.9547)" - gradientUnits="userSpaceOnUse" - id="radialGradient4455" - xlink:href="#linearGradient3030" - inkscape:collect="always" /> - <radialGradient - r="20" - fy="96" - fx="-40" - cy="84" - cx="-44" - gradientTransform="translate(144.36675,15.9547)" - gradientUnits="userSpaceOnUse" - id="radialGradient4451" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - y2="108.0104" - x2="11.68106" - y1="60.539303" - x1="11.68106" - gradientTransform="translate(81.679251,15.9547)" - gradientUnits="userSpaceOnUse" - id="linearGradient4448" - xlink:href="#linearGradient3272" - inkscape:collect="always" /> - <linearGradient - y2="96.001434" - x2="11.68106" - y1="52" - x1="6.6976352" - gradientTransform="translate(81.669111,15.9547)" - gradientUnits="userSpaceOnUse" - id="linearGradient4445" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="72" - x2="14.697635" - y1="96" - x1="26.697636" - gradientTransform="translate(81.669111,15.9547)" - gradientUnits="userSpaceOnUse" - id="linearGradient4442" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="84" - x2="120.25" - y1="84" - x1="79.75" - gradientTransform="translate(0.3667409,15.9547)" - gradientUnits="userSpaceOnUse" - id="linearGradient4439" - xlink:href="#linearGradient3225" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4426" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4422" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="18.50366" - x2="76.284438" - y1="18.50366" - x1="64.341991" - gradientTransform="scale(1.039383,0.9621093)" - gradientUnits="userSpaceOnUse" - id="linearGradient4420" - xlink:href="#linearGradient3207" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4418" - xlink:href="#linearGradient5412" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4416" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4414" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="463.13513" - x2="305.67725" - y1="444.45746" - x1="313.74829" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4410" - xlink:href="#linearGradient3586" - inkscape:collect="always" /> - <linearGradient - y2="463.13513" - x2="305.67725" - y1="444.45746" - x1="313.74829" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4408" - xlink:href="#linearGradient3578" - inkscape:collect="always" /> - <linearGradient - y2="441.53894" - x2="299.28384" - y1="482.53894" - x1="270.50647" - gradientUnits="userSpaceOnUse" - id="linearGradient4406" - xlink:href="#linearGradient3508" - inkscape:collect="always" /> - <linearGradient - y2="434.35086" - x2="290.62091" - y1="453.0892" - x1="315.72318" - gradientTransform="translate(58.5,26.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4404" - xlink:href="#linearGradient3343" - inkscape:collect="always" /> - <linearGradient - y2="434.35086" - x2="290.62091" - y1="453.0892" - x1="315.72318" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4402" - xlink:href="#linearGradient3343" - inkscape:collect="always" /> - <linearGradient - y2="429.73987" - x2="310.53195" - y1="476.40894" - x1="326" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4400" - xlink:href="#linearGradient4126" - inkscape:collect="always" /> - <linearGradient - y2="458.62648" - x2="461.90625" - y1="458.62646" - x1="414.41586" - gradientUnits="userSpaceOnUse" - id="linearGradient4398" - xlink:href="#linearGradient4067" - inkscape:collect="always" /> - <linearGradient - y2="443.03894" - x2="312.78384" - y1="463.03894" - x1="283.50647" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4396" - xlink:href="#linearGradient3516" - inkscape:collect="always" /> - <linearGradient - y2="214.96599" - x2="568.9887" - y1="214.96599" - x1="563.64667" - gradientTransform="matrix(0.5366445,0,0,1.8634309,-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4392" - xlink:href="#linearGradient3733" - inkscape:collect="always" /> - <linearGradient - y2="373.61218" - x2="339.76785" - y1="390.86218" - x1="353.44516" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4390" - xlink:href="#linearGradient3581" - inkscape:collect="always" /> - <linearGradient - y2="367.39182" - x2="320.36423" - y1="407.39011" - x1="330.09335" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4388" - xlink:href="#linearGradient3499" - inkscape:collect="always" /> - <linearGradient - y2="384.62384" - x2="345.62039" - y1="385.86126" - x1="304.88664" - gradientUnits="userSpaceOnUse" - id="linearGradient4386" - xlink:href="#linearGradient3489" - inkscape:collect="always" /> - <linearGradient - y2="370.57019" - x2="325.7691" - y1="398.85446" - x1="324.65039" - gradientUnits="userSpaceOnUse" - id="linearGradient4382" - xlink:href="#linearGradient3433" - inkscape:collect="always" /> - <radialGradient - r="0.79621875" - fy="397.17727" - fx="303.71943" - cy="397.17727" - cx="303.71943" - gradientTransform="matrix(1,0,0,2.5768702,-372.5,-950.79699)" - gradientUnits="userSpaceOnUse" - id="radialGradient4380" - xlink:href="#linearGradient3837" - inkscape:collect="always" /> - <radialGradient - r="0.79621875" - fy="397.17727" - fx="303.71943" - cy="397.17727" - cx="303.71943" - gradientTransform="matrix(1,0,0,2.5768702,43.133514,-626.29699)" - gradientUnits="userSpaceOnUse" - id="radialGradient4378" - xlink:href="#linearGradient3837" - inkscape:collect="always" /> - <linearGradient - y2="418.65884" - x2="331.42062" - y1="431.1243" - x1="317.01251" - gradientTransform="translate(-372.5,-324.5)" - gradientUnits="userSpaceOnUse" - id="linearGradient4376" - xlink:href="#linearGradient3329" - inkscape:collect="always" /> - <linearGradient - y2="422.63611" - x2="412.78592" - y1="400.84558" - x1="412.78592" - gradientUnits="userSpaceOnUse" - id="linearGradient4374" - xlink:href="#linearGradient3163" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3445"> - <stop - style="stop-color:#f9ede0;stop-opacity:1;" - offset="0" - id="stop3447" /> - <stop - id="stop3670" - offset="0.5" - style="stop-color:#f9ede0;stop-opacity:0.80575538;" /> - <stop - style="stop-color:#f9ede0;stop-opacity:0;" - offset="1" - id="stop3450" /> - </linearGradient> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath3705"> - <path - sodipodi:nodetypes="cccccccc" - id="path3707" - d="M 341.25,409.625 C 339.73679,416.82736 335.50876,433.0214 340.75,436.875 C 340.10353,443.87478 333.6714,446.51892 325.75,448.0625 L 324.25,448.0625 C 316.3286,446.51892 309.89647,443.87478 309.25,436.875 C 314.49124,433.0214 310.26321,416.82736 308.75,409.625 L 325,417.03125 L 341.25,409.625 z " - style="opacity:0.74906365;fill:url(#radialGradient3709);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - </clipPath> - <linearGradient - id="linearGradient3149"> - <stop - style="stop-color:#faf0e5;stop-opacity:1;" - offset="0" - id="stop3151" /> - <stop - id="stop10454" - offset="0.591133" - style="stop-color:#f7e7d6;stop-opacity:1;" /> - <stop - style="stop-color:#efcfac;stop-opacity:1;" - offset="1" - id="stop3153" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3279" - id="radialGradient3291" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.4395859,0.3535533,-174.66839)" - cx="412.43236" - cy="395.73904" - fx="412.43236" - fy="395.73904" - r="22.444886" /> - <mask - maskUnits="userSpaceOnUse" - id="mask3287"> - <path - style="opacity:1;fill:url(#radialGradient3291);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 412.56716,362.7206 C 404.7906,362.9256 395.78945,368.58113 392.66091,375.5331 C 389.47419,382.61431 389.9381,391.06936 391.84841,400.8456 C 393.75873,410.62183 400.03668,420.79216 403.22341,424.4706 C 406.24381,427.95705 410.11265,427.32692 412.56716,427.25185 C 412.69296,427.25185 412.8695,427.24772 413.00466,427.25185 C 415.45917,427.32692 419.32801,427.95705 422.34841,424.4706 C 425.53514,420.79216 431.81309,410.62183 433.72341,400.8456 C 435.63374,391.06936 436.09763,382.61431 432.91091,375.5331 C 429.78236,368.58113 420.78122,362.9256 413.00466,362.7206 L 412.56716,362.7206 z " - id="path3289" - sodipodi:nodetypes="csssssssscc" /> - </mask> - <linearGradient - inkscape:collect="always" - id="linearGradient3329"> - <stop - style="stop-color:#f9eee2;stop-opacity:1;" - offset="0" - id="stop3331" /> - <stop - style="stop-color:#f9eee2;stop-opacity:0;" - offset="1" - id="stop3333" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3837"> - <stop - style="stop-color:#f1e4d4;stop-opacity:1;" - offset="0" - id="stop3839" /> - <stop - style="stop-color:#f1e4d4;stop-opacity:0;" - offset="1" - id="stop3841" /> - </linearGradient> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath3429"> - <path - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 303.70236,398.81874 L 303.52558,385.56049 L 306.17724,378.31265 L 311.48054,376.54488 L 319.96582,379.19653 L 327.39044,380.61074 L 334.63828,376.89843 L 339.94158,376.89843 L 343.65389,382.02496 L 345.59844,390.15668 L 345.42166,395.45998 L 345.77521,397.40453 L 337.99704,382.37851 L 328.4511,386.09082 L 321.55681,386.2676 L 311.12698,381.31785 L 303.70236,398.81874 z " - id="path3431" /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3433"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3435" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3437" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3433" - id="linearGradient3439" - x1="324.65039" - y1="398.85446" - x2="325.7691" - y2="370.57019" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3368"> - <stop - style="stop-color:#e5d3c3;stop-opacity:1;" - offset="0" - id="stop3370" /> - <stop - style="stop-color:#e5d3c3;stop-opacity:0;" - offset="1" - id="stop3372" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3489"> - <stop - style="stop-color:#765c44;stop-opacity:1;" - offset="0" - id="stop10422" /> - <stop - style="stop-color:#765c44;stop-opacity:0;" - offset="1" - id="stop10424" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3499"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3501" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3503" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3581"> - <stop - style="stop-color:#dfcbba;stop-opacity:1;" - offset="0" - id="stop3583" /> - <stop - style="stop-color:#dfcbba;stop-opacity:0;" - offset="1" - id="stop3585" /> - </linearGradient> - <linearGradient - id="linearGradient10403"> - <stop - style="stop-color:#f4f5f8;stop-opacity:1;" - offset="0" - id="stop10405" /> - <stop - style="stop-color:#fdfdfe;stop-opacity:1;" - offset="1" - id="stop10407" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3516"> - <stop - style="stop-color:#c8cddc;stop-opacity:1;" - offset="0" - id="stop3518" /> - <stop - style="stop-color:#c8cddc;stop-opacity:0;" - offset="1" - id="stop3520" /> - </linearGradient> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath4063"> - <path - style="fill:#f4f5f8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 410.16587,443.06739 C 399.92306,443.35352 396.79838,439.11371 395.91587,435.375 C 394.63808,435.58506 393.88204,436.60113 393.91587,437.375 C 386.83254,440.20988 378.26803,443.06735 370.66587,446.875 C 367.84405,448.28835 364.62926,452.59537 363.79087,454.875 C 361.23389,461.82756 358.41587,471.625 358.41587,471.625 L 359.91587,473.375 C 375.56063,482.28715 396.79503,481.875 410.16587,481.875 C 423.53671,481.875 444.77111,482.28715 460.41587,473.375 L 461.91587,471.625 C 461.91587,471.625 459.09785,461.82756 456.54087,454.875 C 455.70248,452.59537 452.48769,448.28835 449.66587,446.875 C 442.06371,443.06735 433.4992,440.20988 426.41587,437.375 C 426.4497,436.60113 425.69366,435.58506 424.41587,435.375 C 422.00224,439.11764 420.40868,442.78126 410.16587,443.06739 z " - id="path4065" - sodipodi:nodetypes="cccssccsccssccz" /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient4067"> - <stop - style="stop-color:#8d97b7;stop-opacity:1;" - offset="0" - id="stop4069" /> - <stop - style="stop-color:#8d97b7;stop-opacity:0;" - offset="1" - id="stop4071" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4067" - id="linearGradient4073" - x1="414.41586" - y1="458.62646" - x2="461.90625" - y2="458.62648" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4126"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop4128" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop4130" /> - </linearGradient> - <filter - inkscape:collect="always" - x="-0.020813678" - width="1.0416274" - y="-0.13193184" - height="1.2638637" - id="filter3283"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.60896269" - id="feGaussianBlur3285" /> - </filter> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath3289"> - <path - id="path3291" - d="M 463.75,435.375 C 462.47221,435.58506 461.71617,436.60113 461.75,437.375 C 461.67075,437.40672 460.87251,438.49769 460.79289,438.52941 C 462.04491,442.53121 465.95016,446.80149 477.54289,446.49816 C 489.04307,446.19726 493.45299,441.22873 494.71875,437.5625 C 494.5676,437.5025 494.39985,437.43497 494.25,437.375 C 494.28383,436.60113 493.52779,435.58506 492.25,435.375 C 489.83637,439.11764 488.24281,442.77637 478,443.0625 C 467.75719,443.34864 464.63251,439.11371 463.75,435.375 z M 459.125,438.40625 C 453.68198,440.50508 447.66707,442.67009 441.90625,445.28125 C 447.80188,443.05208 453.52791,442.11601 458.76072,440.15441 C 458.75013,439.92745 459.01107,438.6493 459.125,438.40625 z M 497.46875,438.625 C 497.52198,438.79302 497.56984,438.93659 497.5625,439.09375 C 501.77057,440.67121 506.39991,442.24968 511.125,443.96875 C 506.49146,442.00962 501.81994,440.29346 497.46875,438.625 z " - style="fill:#f4f5f8;fill-opacity:1;fill-rule:evenodd;stroke:#98a2bf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3283)" - sodipodi:nodetypes="cccscccsccccccccc" /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3343"> - <stop - style="stop-color:#bbc1d4;stop-opacity:1;" - offset="0" - id="stop3345" /> - <stop - style="stop-color:#bbc1d4;stop-opacity:0;" - offset="1" - id="stop3347" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3508"> - <stop - style="stop-color:#c8cddc;stop-opacity:1;" - offset="0" - id="stop3510" /> - <stop - style="stop-color:#c8cddc;stop-opacity:0;" - offset="1" - id="stop3512" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3586"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3588" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3590" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3578"> - <stop - style="stop-color:#c8cddc;stop-opacity:1;" - offset="0" - id="stop3580" /> - <stop - style="stop-color:#c8cddc;stop-opacity:0;" - offset="1" - id="stop3582" /> - </linearGradient> - <linearGradient - id="linearGradient10207"> - <stop - offset="0" - id="stop10209" - style="stop-color:#a2a2a2;stop-opacity:1;" /> - <stop - offset="1" - id="stop10211" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <radialGradient - id="radialGradient3563" - r="139.55859" - cx="102" - cy="112.3047" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - id="stop41" - style="stop-color:#b7b8b9;stop-opacity:1;" /> - <stop - offset="0.18851049" - id="stop47" - style="stop-color:#ECECEC" /> - <stop - offset="0.25718147" - id="stop49" - style="stop-color:#FAFAFA" /> - <stop - offset="0.30111277" - id="stop51" - style="stop-color:#FFFFFF" /> - <stop - offset="0.5313" - id="stop53" - style="stop-color:#FAFAFA" /> - <stop - offset="0.8449" - id="stop55" - style="stop-color:#EBECEC" /> - <stop - offset="1" - id="stop57" - style="stop-color:#E1E2E3" /> - </radialGradient> - <clipPath - id="clipPath7084" - clipPathUnits="userSpaceOnUse"> - <path - id="path7086" - d="M 72,88 L 40,120 L 32,120 L 32,80 L 72,80 L 72,88 z" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - </clipPath> - <radialGradient - id="radialGradient3576" - r="111.0006" - cx="51.9995" - cy="-9" - gradientUnits="userSpaceOnUse"> - <stop - offset="0.15" - id="stop4094" - style="stop-color:#80B3FF" /> - <stop - offset="0.316" - id="stop4096" - style="stop-color:#69A1F0" /> - <stop - offset="0.6029" - id="stop4098" - style="stop-color:#4888DA" /> - <stop - offset="0.8412" - id="stop4100" - style="stop-color:#3378CC" /> - <stop - offset="1" - id="stop4102" - style="stop-color:#2C72C7" /> - </radialGradient> - <radialGradient - id="radialGradient4029" - r="130.5231" - gradientTransform="matrix(0.198406,0,-5.256355e-3,-0.198406,-452.9859,-58.52922)" - cx="336.8938" - cy="-319.7261" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - id="stop4031" - style="stop-color:#eaf1f9;stop-opacity:1;" /> - <stop - offset="1" - id="stop4033" - style="stop-color:#6f9dd4;stop-opacity:1;" /> - </radialGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient4043" - gradientTransform="matrix(0.6271072,1.3435609,-0.7440573,0.3472888,538.32007,-171.10992)" - r="6.4375601" - cy="449.10031" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3966" - cx="345.53156" - fy="447.89981" - fx="343.00021" /> - <clipPath - id="clipPath4039" - clipPathUnits="userSpaceOnUse"> - <path - sodipodi:nodetypes="cscccc" - id="path4041" - style="fill:url(#radialGradient4043);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 415.8125,440.4375 C 414.69896,440.61567 414.33846,443.75374 414.40625,445.3125 C 414.40812,445.35551 414.43282,445.39464 414.4375,445.4375 C 414.49547,443.80258 415.97665,445.88291 416.91692,445.73246 C 424.23751,446.34597 427.00968,449.13044 427.25,455.8125 C 427.38557,448.85411 423.50133,441.08187 415.8125,440.4375 z " /> - </clipPath> - <clipPath - id="clipPath3962" - clipPathUnits="userSpaceOnUse"> - <path - sodipodi:nodetypes="cssccs" - id="path3964" - style="fill:#9e4d00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 358.01834,438.97595 C 357.59747,440.23856 357.22962,442.15708 355.93583,442.4468 C 349.87757,443.80344 345.42647,448.95565 341.35825,451.47101 C 340.38372,452.07355 338.42431,449.84758 338.58157,448.69433 C 340.03178,437.86157 348.08195,432.26287 358.6704,433.26137 C 360.12926,433.53925 358.75442,436.76771 358.01834,438.97595 z " /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3960" - y2="457.31671" - y1="443.57492" - x2="338.31857" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3954" - x1="344.42279" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3826" - y2="481.68478" - y1="490.76556" - x2="414.53983" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3725" - x1="406.42133" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3753" - y2="481.68478" - y1="490.76556" - x2="414.53983" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3725" - x1="406.42133" /> - <clipPath - id="clipPath3721" - clipPathUnits="userSpaceOnUse"> - <path - sodipodi:nodetypes="ccccc" - d="M 412.19342,476.96031 C 410.35061,480.92803 407.68758,484.89576 403.23536,488.86348 L 410.59814,498.18968 L 414.28984,477.93625 L 412.19342,476.96031 z " - style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#443d39;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3715)" - id="path3723" /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3666" - y2="601.20837" - y1="507.61142" - x2="335.73438" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3660" - x1="335.73438" /> - <radialGradient - inkscape:collect="always" - id="radialGradient3658" - gradientTransform="matrix(1.2052707,-4.0003338e-2,2.6834447e-2,0.808502,-82.264072,161.43979)" - r="33.234375" - cy="497.40625" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3344" - cx="335.73438" - fy="477.125" - fx="333.77097" /> - <clipPath - id="clipPath3654" - clipPathUnits="userSpaceOnUse"> - <path - sodipodi:nodetypes="cccccccc" - id="path3656" - style="fill:url(#radialGradient3658);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 324.40625,531.66319 C 316.67961,536.03379 303.2331,537.43094 302.5,561.06944 C 312.01264,565.36969 321.20376,567.82558 330.125,568.66319 C 328.5786,556.23989 328.33033,543.49207 324.40625,531.66319 z M 347.0625,531.66319 C 343.15799,544.49609 342.8577,556.42793 341.34375,568.66319 C 350.26499,567.82558 359.45611,565.36969 368.96875,561.06944 C 368.23565,537.43094 354.78914,536.03379 347.0625,531.66319 z " /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3279" - x1="338.62283" - y1="457.90872" - gradientTransform="translate(-95.225391,0)" - x2="339.51855" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3215" - y2="502.82175" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3277" - x1="338.62283" - y1="457.90872" - gradientTransform="translate(-95.225391,0)" - x2="339.51855" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3243" - y2="502.82175" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3275" - x1="335.75745" - y1="507.97568" - gradientTransform="translate(-95.225391,0)" - x2="335.75745" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3163" - y2="464.28983" /> - <clipPath - id="clipPath3271" - clipPathUnits="userSpaceOnUse"> - <path - id="path3273" - d="M 229.42268,467.3088 C 229.51298,471.22964 233.14108,476.22468 230.76643,477.9338 C 223.45451,483.19644 208.11369,483.00448 207.32893,508.3088 C 218.62909,513.41712 229.47403,515.93916 239.95393,516.21505 L 239.95393,516.2463 C 240.14167,516.24433 240.32846,516.21847 240.51643,516.21505 C 240.71484,516.21875 240.91203,516.24422 241.11018,516.2463 L 241.11018,516.21505 C 251.59008,515.93916 262.43501,513.41712 273.73518,508.3088 C 272.95042,483.00448 257.60959,483.19644 250.29768,477.9338 C 247.92303,476.22468 251.55112,471.22964 251.64143,467.3088 L 241.11018,467.3088 L 239.95393,467.3088 L 229.42268,467.3088 z " - style="fill:url(#linearGradient3275);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3277);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3263)" /> - </clipPath> - <linearGradient - inkscape:collect="always" - id="linearGradient3231" - y2="434.86758" - y1="470.94525" - x2="379.6608" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3215" - x1="379.90604" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3229" - y2="434.86758" - y1="470.94525" - x2="379.6608" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3215" - x1="379.90604" /> - <clipPath - id="clipPath3225" - clipPathUnits="userSpaceOnUse"> - <path - id="path3227" - d="M 383.54353,478.3067 C 383.54353,478.3067 383.54353,478.2755 383.54353,478.27545 C 387.76892,478.03106 393.00672,475.3434 395.41853,467.77545 C 397.73728,460.49954 400.0019,441.59235 383.29353,441.4942 C 383.24998,441.49394 383.21234,441.4942 383.16853,441.4942 C 366.45726,441.59036 368.69342,460.49915 371.01228,467.77545 C 373.4286,475.35755 378.68907,478.03988 382.91853,478.27545 C 382.91853,478.2755 382.91853,478.3067 382.91853,478.3067 C 383.02222,478.3067 383.12585,478.30974 383.23103,478.3067 C 383.33227,478.30952 383.44367,478.3067 383.54353,478.3067 z " - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3229);stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3211)" /> - </clipPath> - <linearGradient - id="linearGradient3163"> - <stop - offset="0" - id="stop3165" - style="stop-color:#fff5e4;stop-opacity:1;" /> - <stop - offset="0.25" - id="stop3173" - style="stop-color:#ffecd0;stop-opacity:1;" /> - <stop - offset="0.5" - id="stop3171" - style="stop-color:#ffd390;stop-opacity:1;" /> - <stop - offset="1" - id="stop3167" - style="stop-color:#ffc46a;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient3215"> - <stop - offset="0" - id="stop3217" - style="stop-color:#671800;stop-opacity:1;" /> - <stop - offset="1" - id="stop3616" - style="stop-color:#7b3900;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3243"> - <stop - offset="0" - id="stop3245" - style="stop-color:#492200;stop-opacity:1;" /> - <stop - offset="1" - id="stop3247" - style="stop-color:#492200;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3344"> - <stop - offset="0" - id="stop3346" - style="stop-color:#4190f0;stop-opacity:1;" /> - <stop - offset="1" - id="stop3348" - style="stop-color:#003474;stop-opacity:1;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3725"> - <stop - offset="0" - id="stop3727" - style="stop-color:#443d39;stop-opacity:1;" /> - <stop - offset="1" - id="stop3729" - style="stop-color:#443d39;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3733"> - <stop - offset="0" - id="stop3735" - style="stop-color:#e2e2e2;stop-opacity:1;" /> - <stop - offset="1" - id="stop3737" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient3776"> - <stop - offset="0" - id="stop3778" - style="stop-color:#e2e2e2;stop-opacity:1;" /> - <stop - offset="1" - id="stop3780" - style="stop-color:#f6f6f6;stop-opacity:1;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3954"> - <stop - offset="0" - id="stop3956" - style="stop-color:#582b00;stop-opacity:1;" /> - <stop - offset="1" - id="stop3958" - style="stop-color:#582b00;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3966"> - <stop - offset="0" - id="stop3968" - style="stop-color:#9e4d00;stop-opacity:1;" /> - <stop - offset="1" - id="stop3970" - style="stop-color:#582b00;stop-opacity:1;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8788-240" - y2="-47.429035" - y1="175.07643" - gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" - x2="81.170044" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5138-431" - x1="68.151932" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5138-431"> - <stop - offset="0" - id="stop9560" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9562" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8790-390" - y2="-52.535206" - y1="151.92928" - gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" - x2="46.899311" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5138-357" - x1="69.878143" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5138-357"> - <stop - offset="0" - id="stop9566" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9568" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8792-242" - y2="-30.656776" - y1="154.70549" - gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" - x2="59.615398" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5138-963" - x1="56.796875" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5138-963"> - <stop - offset="0" - id="stop9572" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9574" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8794-273" - y2="-30.656776" - y1="225.10069" - gradientTransform="matrix(9.2600924e-2,0,0,6.7306822e-2,53.462461,80.322293)" - x2="59.615398" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5138-418" - x1="50.794651" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5138-418"> - <stop - offset="0" - id="stop9578" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9580" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8796-338" - y2="2.4206059" - x2="-245.23932" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,81.430716,80.369907)" - y1="2.4206059" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - xlink:href="#linearGradient3155-136" - x1="-271.94705" /> - <linearGradient - id="linearGradient3155-136"> - <stop - offset="0" - id="stop9584" - style="stop-color:#c0c0c0;stop-opacity:1;" /> - <stop - offset="0.05494506" - id="stop9586" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="0.13802682" - id="stop9588" - style="stop-color:#cdcdcd;stop-opacity:1;" /> - <stop - offset="1" - id="stop9590" - style="stop-color:#c0c0c0;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8798-742" - r="1.71875" - gradientTransform="matrix(3.701324,0,0,4.437062,825.0355,-247.7547)" - cx="-305.8125" - cy="72.04689" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient4314-431" - fy="72.04689" - fx="-305.8125" /> - <linearGradient - id="linearGradient4314-431"> - <stop - offset="0" - id="stop9594" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - offset="1" - id="stop9596" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8800-380" - r="1.71875" - gradientTransform="matrix(-3.701324,0,0,4.437062,-1441.79,-247.7547)" - cx="-305.8125" - cy="72.04689" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient4314-973" - fy="72.04689" - fx="-305.8125" /> - <linearGradient - id="linearGradient4314-973"> - <stop - offset="0" - id="stop9600" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - offset="1" - id="stop9602" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8802-299" - r="3.1579585" - gradientTransform="matrix(1.197994,0,0,11.8021,61.03381,-775.397)" - cx="-308.26053" - cy="71.782082" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient4328-565" - fy="71.782082" - fx="-308.26053" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4328-565"> - <stop - offset="0" - id="stop9606" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9608" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8804-885" - y2="11.619458" - y1="57.962109" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,81.430716,80.369907)" - x2="-263.14236" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3185-940" - x1="-263.14236" /> - <linearGradient - id="linearGradient3185-940"> - <stop - offset="0" - id="stop9612" - style="stop-color:#575757;stop-opacity:1;" /> - <stop - offset="0.95604396" - id="stop9614" - style="stop-color:#575757;stop-opacity:1;" /> - <stop - offset="1" - id="stop9616" - style="stop-color:#575757;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8806-280" - y2="75.477737" - y1="68.347794" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,75.802165,80.117371)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-504" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-504"> - <stop - offset="0" - id="stop9620" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9622" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8808-332" - y2="75.602806" - y1="70.558701" - gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-936" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-936"> - <stop - offset="0" - id="stop9626" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9628" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8810-82" - y2="75.602806" - y1="70.193672" - gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-362" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-362"> - <stop - offset="0" - id="stop9632" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9634" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8812-828" - y2="75.602806" - y1="70.558701" - gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-408" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-408"> - <stop - offset="0" - id="stop9638" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9640" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8814-817" - y2="75.602806" - y1="70.558701" - gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-537" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-537"> - <stop - offset="0" - id="stop9644" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9646" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8816-697" - y2="75.602806" - y1="69.834503" - gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-734" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-734"> - <stop - offset="0" - id="stop9650" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9652" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8818-387" - y2="75.602806" - y1="70.105728" - gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-288" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-288"> - <stop - offset="0" - id="stop9656" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9658" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8820-174" - y2="75.602806" - y1="70.558701" - gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-880" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-880"> - <stop - offset="0" - id="stop9662" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9664" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8822-224" - y2="75.602806" - y1="70.09758" - gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-633" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-633"> - <stop - offset="0" - id="stop9668" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9670" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8824-600" - y2="75.602806" - y1="69.925575" - gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-626" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-626"> - <stop - offset="0" - id="stop9674" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9676" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8826-227" - y2="75.602806" - y1="69.289864" - gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-637" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-637"> - <stop - offset="0" - id="stop9680" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9682" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8828-860" - y2="75.602806" - y1="69.473351" - gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-1" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-1"> - <stop - offset="0" - id="stop9686" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9688" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8830-802" - y2="75.602806" - y1="68.387428" - gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-384" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-384"> - <stop - offset="0" - id="stop9692" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9694" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8832-779" - y2="75.602806" - y1="67.799118" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,78.389987,80.117371)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-595" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-595"> - <stop - offset="0" - id="stop9698" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9700" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8834-162" - y2="17.674025" - y1="-5.8208742" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.267725,80.302597)" - x2="-308.16672" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3332-935" - x1="-308.16672" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3332-935"> - <stop - offset="0" - id="stop9704" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9706" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8836-403" - y2="74.042549" - y1="68.347794" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,75.802165,-90.302128)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-345" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-345"> - <stop - offset="0" - id="stop9710" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9712" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8838-639" - y2="74.050728" - y1="67.799118" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,78.389987,-90.302128)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-924" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-924"> - <stop - offset="0" - id="stop9716" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9718" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8840-852" - r="3.0016239" - gradientTransform="matrix(0.993747,-0.111657,0.181818,1.618182,-15.10182,-79.18066)" - cx="-308.11151" - cy="73.535744" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3373-257" - fy="73.535744" - fx="-308.11151" /> - <linearGradient - id="linearGradient3373-257"> - <stop - offset="0" - id="stop9722" - style="stop-color:#a1a1a1;stop-opacity:1;" /> - <stop - offset="0.81318682" - id="stop9724" - style="stop-color:#d7d7d7;stop-opacity:1;" /> - <stop - offset="1" - id="stop9726" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8842-960" - r="3.0016239" - cx="-307.9166" - cy="72.469955" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3394-952" - fy="72.469955" - fx="-307.9166" /> - <linearGradient - id="linearGradient3394-952"> - <stop - offset="0" - id="stop9730" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="0.93406594" - id="stop9732" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9734" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8844-345" - r="3.0016239" - cx="-307.9166" - cy="72.469955" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3373-528" - fy="73.394211" - fx="-307.9166" /> - <linearGradient - id="linearGradient3373-528"> - <stop - offset="0" - id="stop9738" - style="stop-color:#a1a1a1;stop-opacity:1;" /> - <stop - offset="0.81318682" - id="stop9740" - style="stop-color:#d7d7d7;stop-opacity:1;" /> - <stop - offset="1" - id="stop9742" - style="stop-color:#ffffff;stop-opacity:1;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8846-419" - y2="75.602806" - y1="69.289864" - gradientTransform="matrix(0.960548,0,0,0.977778,-68.94974,12.35235)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-145" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-145"> - <stop - offset="0" - id="stop9746" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9748" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8848-408" - y2="75.602806" - y1="69.473351" - gradientTransform="matrix(0.960548,0,0,0.977778,-54.78969,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-95" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-95"> - <stop - offset="0" - id="stop9752" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9754" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8850-218" - y2="75.602806" - y1="68.387428" - gradientTransform="matrix(0.960548,0,0,0.977778,-40.62962,12.35236)" - x2="-199.18291" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3197-851" - x1="-199.18291" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3197-851"> - <stop - offset="0" - id="stop9758" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9760" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - id="radialGradient8852-503" - r="17.759607" - gradientTransform="matrix(9.2600781e-2,0,0,6.0990382e-2,87.267725,80.593034)" - cx="-326.17645" - cy="20.49044" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - xlink:href="#linearGradient4645-53" - fy="32.982586" - fx="-324.23087" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4645-53"> - <stop - offset="0" - id="stop9764" - style="stop-color:#c4c4c4;stop-opacity:1;" /> - <stop - offset="1" - id="stop9766" - style="stop-color:#c4c4c4;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8854-34" - y2="143.7717" - y1="-29.916986" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.218595,80.369907)" - x2="-237.00941" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient4367-760" - x1="-344.84647" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4367-760"> - <stop - offset="0" - id="stop9770" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - offset="1" - id="stop9772" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8856-755" - y2="81.967781" - y1="213.61119" - gradientTransform="matrix(8.8862736e-2,0,0,6.4589754e-2,53.234665,80.265175)" - x2="61.920132" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5298-641" - x1="79.793121" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5298-641"> - <stop - offset="0" - id="stop9776" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - offset="1" - id="stop9778" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient8858-758" - y2="12.583951" - y1="64.938179" - gradientTransform="matrix(9.2600781e-2,0,0,6.7306715e-2,87.267725,80.369907)" - x2="-268.89709" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient4635-148" - x1="-313.55511" /> - <linearGradient - inkscape:collect="always" - id="linearGradient4635-148"> - <stop - offset="0" - id="stop9782" - style="stop-color:#c4c4c4;stop-opacity:1;" /> - <stop - offset="1" - id="stop9784" - style="stop-color:#c4c4c4;stop-opacity:0;" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="29.061501" - y1="20.361799" - x2="29.112801" - y2="20.361799" - id="XMLID_102_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop270" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop272" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop274" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="28.059601" - y1="23.623501" - x2="28.2612" - y2="23.623501" - id="XMLID_101_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop261" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop263" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop265" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="28.949699" - y1="20.691401" - x2="29.024401" - y2="20.691401" - id="XMLID_100_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop252" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop254" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop256" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="28.805201" - y1="21.127001" - x2="28.9102" - y2="21.127001" - id="XMLID_99_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop243" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop245" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop247" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="28.278799" - y1="22.257799" - x2="28.795401" - y2="22.257799" - id="XMLID_98_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop234" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop236" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop238" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="21.637699" - y1="60.8311" - x2="22.4736" - y2="60.8311" - id="XMLID_96_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop216" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop218" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop220" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="22.757299" - y1="39.152802" - x2="27.8032" - y2="39.152802" - id="XMLID_95_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop11322" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop11324" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop211" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="22.4995" - y1="54.563499" - x2="22.7397" - y2="54.563499" - id="XMLID_94_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop198" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop11317" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop11319" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="27.808599" - y1="24.5352" - x2="28.0327" - y2="24.5352" - id="XMLID_93_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop189" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop191" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop11313" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="29.142599" - y1="20.1499" - x2="29.165001" - y2="20.1499" - id="XMLID_91_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop171" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop173" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop11303" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="96.549797" - y1="38.7085" - x2="101.8271" - y2="38.7085" - id="XMLID_90_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop162" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop164" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop166" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="102.1084" - y1="60.8242" - x2="102.9473" - y2="60.8242" - id="XMLID_89_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop153" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop155" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop157" /> - </linearGradient> - <linearGradient - gradientTransform="translate(3.719016,26.033112)" - x1="101.8428" - y1="54.5625" - x2="102.084" - y2="54.5625" - id="XMLID_88_" - gradientUnits="userSpaceOnUse"> - <stop - style="stop-color:#204fa1;stop-opacity:1" - offset="0" - id="stop144" /> - <stop - style="stop-color:#4a8cd9;stop-opacity:1" - offset="0.118" - id="stop146" /> - <stop - style="stop-color:#bae1ff;stop-opacity:1" - offset="1" - id="stop148" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3163" - id="linearGradient3330" - x1="412.78592" - y1="400.84558" - x2="412.78592" - y2="422.63611" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient3849"> - <stop - style="stop-color:#28691f;stop-opacity:1;" - offset="0" - id="stop3851" /> - <stop - style="stop-color:#42ad33;stop-opacity:1;" - offset="1" - id="stop3853" /> - </linearGradient> - <linearGradient - id="linearGradient3855"> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0" - id="stop3857" /> - <stop - id="stop3859" - offset="0.4375" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0.56588125" - id="stop3861" /> - <stop - id="stop3863" - offset="0.76237977" - style="stop-color:#000000;stop-opacity:0.24705882;" /> - <stop - id="stop3865" - offset="0.77884614" - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0.875" - id="stop3867" /> - <stop - id="stop3869" - offset="0.875" - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - id="stop3871" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3879"> - <stop - style="stop-color:#c3c3c3;stop-opacity:1;" - offset="0" - id="stop3881" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop3883" /> - </linearGradient> - <linearGradient - id="linearGradient3885"> - <stop - id="stop3887" - offset="0" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0.4375" - id="stop3889" /> - <stop - id="stop3891" - offset="0.58240438" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0.49803922;" - offset="0.76442307" - id="stop3893" /> - <stop - id="stop3895" - offset="0.875" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:0.49803922;" - offset="0.91826922" - id="stop3897" /> - <stop - id="stop3899" - offset="0.96048182" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3901" /> - </linearGradient> - <linearGradient - id="linearGradient3903"> - <stop - id="stop3905" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop3907" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3909"> - <stop - style="stop-color:#2d2d2d;stop-opacity:1;" - offset="0" - id="stop3911" /> - <stop - id="stop3913" - offset="0.5" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop3915" /> - </linearGradient> - <linearGradient - id="linearGradient3917"> - <stop - style="stop-color:#ffffff;stop-opacity:0.68345326;" - offset="0" - id="stop3919" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3921" /> - </linearGradient> - <linearGradient - id="linearGradient3923"> - <stop - style="stop-color:#ffffff;stop-opacity:0.55035973;" - offset="0" - id="stop3925" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3927" /> - </linearGradient> - <linearGradient - id="linearGradient3929"> - <stop - id="stop3931" - offset="0" - style="stop-color:#ffffff;stop-opacity:0.55035973;" /> - <stop - id="stop3933" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3935"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3937" /> - <stop - style="stop-color:#131313;stop-opacity:0;" - offset="1" - id="stop3939" /> - </linearGradient> - <linearGradient - id="linearGradient3947"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3949" /> - <stop - style="stop-color:#aeaeae;stop-opacity:1;" - offset="1" - id="stop3951" /> - </linearGradient> - <linearGradient - id="linearGradient3959"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3961" /> - <stop - style="stop-color:#252525;stop-opacity:0;" - offset="1" - id="stop3963" /> - </linearGradient> - <linearGradient - id="linearGradient3965"> - <stop - style="stop-color:#b4942a;stop-opacity:1;" - offset="0" - id="stop3967" /> - <stop - style="stop-color:#e4dcc9;stop-opacity:1" - offset="1" - id="stop3969" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient3971" - cx="63.912209" - cy="115.70919" - fx="63.912209" - fy="115.7093" - r="63.912209" - gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2257" - id="radialGradient3973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.519831,9.412826e-2,-0.895354,13.78472,115.1882,-1545.166)" - cx="42.617531" - cy="120.64188" - fx="42.617531" - fy="120.64188" - r="3.406888" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3311" - id="radialGradient3975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.22884e-2,-1.47547e-4,1.889714e-3,0.798624,69.12243,5.487066)" - cx="95.505852" - cy="59.591507" - fx="95.505852" - fy="59.591507" - r="47.746404" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="radialGradient3977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297066,3.012623e-3,-1.134728e-3,0.488669,7.096503,-13.69501)" - cx="49.009884" - cy="8.4953122" - fx="47.370888" - fy="6.7701697" - r="3.9750405" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3217" - id="linearGradient3979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-3.693584e-16,3.693584e-16,1.29707,7.064707,-20.57911)" - x1="48.914677" - y1="2.9719031" - x2="48.913002" - y2="2.5548496" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="radialGradient3981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-4.501275e-16,6.640356e-17,0.1578,7.064707,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3235" - id="linearGradient3983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297066,3.012623e-3,-3.012623e-3,1.297066,7.112448,-20.56258)" - x1="48.498562" - y1="0.81150496" - x2="48.732723" - y2="2.3657269" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient3985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.28993,-5.022494e-16,5.050298e-16,1.29707,7.402337,-20.57911)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3273" - id="radialGradient3987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.860164,-2.800126e-16,6.473209e-17,0.1578,24.75801,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient3989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.279856,4.983275e-16,-5.050298e-16,1.29707,-133.3868,-20.57911)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3259" - id="radialGradient3991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.853446,3.872019e-16,-5.817635e-17,0.1578,-116.1668,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3303" - id="radialGradient3993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,7.573576e-17,-1.374554e-18,2.608014e-2,-7.697455e-14,7.26766)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595197" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3325" - id="radialGradient3995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595196" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3259" - id="radialGradient3997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.853446,3.879821e-16,-5.832064e-17,0.1578,-115.9141,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient3999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.279856,4.994967e-16,-5.062158e-16,1.29707,-133.1341,-10.31269)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3273" - id="radialGradient4001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.860164,-2.80798e-16,6.487638e-17,0.1578,24.50481,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient4003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.28993,-5.034291e-16,5.062158e-16,1.29707,7.14915,-10.31269)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3235" - id="linearGradient4005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297068,-1.880044e-3,1.880044e-3,1.297068,6.796523,-10.3225)" - x1="48.498562" - y1="0.81150496" - x2="48.732723" - y2="2.3657269" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="radialGradient4007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-4.513135e-16,6.654785e-17,0.1578,6.81152,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3217" - id="linearGradient4009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-3.705444e-16,3.705444e-16,1.29707,6.81152,-10.31269)" - x1="48.914677" - y1="2.9719031" - x2="48.913002" - y2="2.5548496" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="radialGradient4011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297068,-1.880044e-3,7.085819e-4,0.48867,6.806484,-3.45491)" - cx="49.009884" - cy="8.4953122" - fx="47.370888" - fy="6.7701697" - r="3.9750405" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3311" - id="radialGradient4013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.228741e-2,-3.825032e-4,4.90218e-3,0.798611,68.90433,5.49306)" - cx="95.505852" - cy="59.591507" - fx="95.505852" - fy="59.591507" - r="47.746404" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2257" - id="radialGradient4015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.520175,8.839467e-2,-0.843351,13.788,109.1206,-1545.323)" - cx="42.617531" - cy="120.64188" - fx="42.617531" - fy="120.64188" - r="3.406888" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3325" - id="radialGradient4017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595196" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2362" - id="linearGradient4019" - x1="74.332748" - y1="17.912012" - x2="54.983063" - y2="90.126022" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.180422,0,0,1.180422,-10.39088,-10.58642)" /> - <linearGradient - id="linearGradient4021"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000" - offset="0.0000000" - id="stop4023" /> - <stop - style="stop-color:#ffffff;stop-opacity:0.0000000" - offset="1.0000000" - id="stop4025" /> - </linearGradient> - <radialGradient - r="139.55859" - fy="142.6467" - fx="128.37613" - cy="142.6467" - cx="128.37613" - gradientTransform="matrix(1.2968852,0,0,1.439407,-188.06465,-41.410401)" - gradientUnits="userSpaceOnUse" - id="radialGradient3308" - xlink:href="#XMLID_8_" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="108" - x2="96" - y1="56" - x1="100" - id="linearGradient3300" - xlink:href="#radialGradient3696" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(144,0)" - y2="75.945503" - x2="-45.818714" - y1="96.082298" - x1="-45.818714" - gradientUnits="userSpaceOnUse" - id="linearGradient4197" - xlink:href="#linearGradient3109" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3223" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3219" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient4193" - xlink:href="#linearGradient5412" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3205" - xlink:href="#linearGradient5412" - inkscape:collect="always" /> - <filter - id="filter3191" - inkscape:collect="always"> - <feGaussianBlur - id="feGaussianBlur3193" - stdDeviation="0.2025" - inkscape:collect="always" /> - </filter> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3097" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="19.281664" - x2="80" - y1="15.336544" - x1="73.742638" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3093" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="72" - x2="14.697635" - y1="96" - x1="26.697636" - gradientTransform="translate(81.302365,0)" - gradientUnits="userSpaceOnUse" - id="linearGradient3089" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="96.001434" - x2="11.68106" - y1="52" - x1="6.6976352" - gradientTransform="translate(81.302365,0)" - gradientUnits="userSpaceOnUse" - id="linearGradient3085" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(81.3125,0)" - gradientUnits="userSpaceOnUse" - y2="108.0104" - x2="11.68106" - y1="60.539303" - x1="11.68106" - id="linearGradient3060" - xlink:href="#linearGradient3202" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(144,0)" - gradientUnits="userSpaceOnUse" - r="24" - fy="100" - fx="-60" - cy="84" - cx="-44" - id="radialGradient3036" - xlink:href="#linearGradient3030" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(144,0)" - gradientUnits="userSpaceOnUse" - r="20" - fy="96" - fx="-40" - cy="84" - cx="-44" - id="radialGradient3026" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(144,0)" - gradientUnits="userSpaceOnUse" - y2="104.80668" - x2="-62.424866" - y1="76.708466" - x1="-13.757333" - id="linearGradient3024" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="117.07014" - x2="95.5" - y1="57.608395" - x1="95.5" - id="linearGradient3971" - xlink:href="#radialGradient3351" - inkscape:collect="always" /> - <radialGradient - r="139.55859" - fy="142.6467" - fx="128.37613" - cy="142.6467" - cx="128.37613" - gradientTransform="matrix(1.2968852,0,0,1.439407,-43.366528,-58.450233)" - gradientUnits="userSpaceOnUse" - id="radialGradient3909" - xlink:href="#XMLID_8_" - inkscape:collect="always" /> - <clipPath - id="clipPath3905" - clipPathUnits="userSpaceOnUse"> - <path - style="fill:url(#radialGradient3909);fill-opacity:1" - d="M 10,9 C 9.449,9 9,9.449 9,10 L 9,118 C 9,118.552 9.449,119 10,119 L 102.307,118.879 C 102.52855,118.879 103,118.435 103,118.172 L 103,10 C 103,9.449 102.552,9 102,9 L 10,9 z " - id="path3907" - sodipodi:nodetypes="ccccccccc" /> - </clipPath> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,-136,-152.52234)" - gradientUnits="userSpaceOnUse" - id="radialGradient3832" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - y2="65.448112" - x2="173.98071" - y1="123.75864" - x1="179.17224" - gradientTransform="translate(-136,-142.00448)" - gradientUnits="userSpaceOnUse" - id="linearGradient3828" - xlink:href="#linearGradient3295" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3449"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3451" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3453" /> - </linearGradient> - <linearGradient - id="linearGradient4062"> - <stop - style="stop-color:#baff63;stop-opacity:1;" - offset="0" - id="stop3680" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3682" /> - </linearGradient> - <linearGradient - id="linearGradient4066"> - <stop - style="stop-color:#cbff9c;stop-opacity:1;" - offset="0" - id="stop3204" /> - <stop - style="stop-color:#65c171;stop-opacity:0" - offset="1" - id="stop3206" /> - </linearGradient> - <linearGradient - id="linearGradient3647"> - <stop - style="stop-color:#c2ebab;stop-opacity:1;" - offset="0" - id="stop3649" /> - <stop - style="stop-color:#71d03c;stop-opacity:0;" - offset="1" - id="stop3651" /> - </linearGradient> - <radialGradient - id="radialGradient3696" - cx="48" - cy="-0.2148" - r="55.148" - gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0" - style="stop-color:#72D13D" - id="stop3698" /> - <stop - offset="0.3553" - style="stop-color:#35AC1C" - id="stop3700" /> - <stop - offset="0.6194" - style="stop-color:#0F9508" - id="stop3702" /> - <stop - offset="0.7574" - style="stop-color:#008C00" - id="stop3704" /> - <stop - offset="1" - style="stop-color:#007A00" - id="stop3706" /> - </radialGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient3470" - x1="123.5" - y1="76" - x2="220.5" - y2="76" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3482" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3575" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3592" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,-108,-22.517857)" - cx="172" - cy="76" - fx="175" - fy="103.23137" - r="56" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3712" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient3633" - gradientUnits="userSpaceOnUse" - x1="123.5" - y1="76" - x2="220.5" - y2="76" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3647" - id="linearGradient3653" - x1="174.5" - y1="36.566975" - x2="174.5" - y2="93.199982" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3647" - id="linearGradient4086" - gradientUnits="userSpaceOnUse" - x1="174.5" - y1="36.566975" - x2="174.5" - y2="93.199982" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3184" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient4089" - gradientUnits="userSpaceOnUse" - x1="123.5" - y1="76" - x2="220.5" - y2="76" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3295" - id="linearGradient4144" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="74.75" - y1="14.275884" - x2="78.939339" - y2="16.750759" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3465" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3467" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="180.75" - fy="125.04931" - r="56" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3295" - id="linearGradient3517" - x1="179.17224" - y1="123.75864" - x2="173.98071" - y2="65.448112" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3295" - id="linearGradient2220" - gradientUnits="userSpaceOnUse" - x1="179.17224" - y1="123.75864" - x2="173.98071" - y2="65.448112" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3295" - id="linearGradient3738" - gradientUnits="userSpaceOnUse" - x1="179.17224" - y1="123.75864" - x2="173.98071" - y2="65.448112" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient2236" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient2238" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="180.75" - fy="125.04931" - r="56" /> - <linearGradient - y2="57.279232" - x2="226.659" - y1="53.784153" - x1="223.32712" - spreadMethod="reflect" - gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)" - gradientUnits="userSpaceOnUse" - id="linearGradient3418" - xlink:href="#linearGradient3202" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="65.448112" - x2="173.98071" - y1="123.75864" - x1="179.17224" - id="linearGradient3415" - xlink:href="#linearGradient3295" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="125.04931" - fx="180.75" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3409" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3407" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5816285,1.767767e-2,-2.6986249e-2,0.8878982,31.921846,5.9419094)" - r="60" - fy="66.344505" - fx="72.020813" - cy="66.344505" - cx="72.020813" - id="radialGradient3405" - xlink:href="#linearGradient3449" - inkscape:collect="always" /> - <linearGradient - spreadMethod="reflect" - y2="57.279232" - x2="226.659" - y1="53.784153" - x1="223.32712" - gradientTransform="matrix(1,0,0,0.8610463,-108.16138,-1.4361867)" - gradientUnits="userSpaceOnUse" - id="linearGradient3399" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - gradientTransform="matrix(1,0,0,0.8610463,-108,-1.4361867)" - y2="108.51858" - x2="212" - y1="76" - x1="108" - gradientUnits="userSpaceOnUse" - id="linearGradient4127" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - y2="16.750759" - x2="78.939339" - y1="14.275884" - x1="74.75" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - id="linearGradient3395" - xlink:href="#linearGradient3295" - inkscape:collect="always" /> - <linearGradient - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - y2="16.750759" - x2="78.939339" - y1="15.336544" - x1="73.742638" - id="linearGradient3389" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <linearGradient - y2="76" - x2="220.5" - y1="76" - x1="123.5" - gradientUnits="userSpaceOnUse" - id="linearGradient3387" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="76.455902" - x2="67.73996" - y1="13.043323" - x1="79.589897" - id="linearGradient3385" - xlink:href="#linearGradient3260" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="125.04931" - fx="180.75" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3383" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="83.235832" - x2="75.957108" - y1="16.154284" - x1="74.03466" - id="linearGradient3381" - xlink:href="#linearGradient3202" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient9932" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - y2="93.199982" - x2="174.5" - y1="36.566975" - x1="174.5" - gradientUnits="userSpaceOnUse" - id="linearGradient9930" - xlink:href="#linearGradient3647" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="93.199982" - x2="174.5" - y1="36.566975" - x1="174.5" - id="linearGradient9928" - xlink:href="#linearGradient3647" - inkscape:collect="always" /> - <linearGradient - y2="76" - x2="220.5" - y1="76" - x1="123.5" - gradientUnits="userSpaceOnUse" - id="linearGradient3373" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3371" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="103.23137" - fx="175" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,-108,-22.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3369" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - gradientUnits="userSpaceOnUse" - id="radialGradient3367" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - id="radialGradient3365" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="76" - x2="220.5" - y1="76" - x1="123.5" - id="linearGradient3363" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" - r="55.148" - cy="-0.2148" - cx="48" - id="radialGradient3351"> - <stop - id="stop3353" - style="stop-color:#72D13D" - offset="0" /> - <stop - id="stop3355" - style="stop-color:#35AC1C" - offset="0.3553" /> - <stop - id="stop3357" - style="stop-color:#0F9508" - offset="0.6194" /> - <stop - id="stop3359" - style="stop-color:#008C00" - offset="0.7574" /> - <stop - id="stop3361" - style="stop-color:#007A00" - offset="1" /> - </radialGradient> - <linearGradient - id="linearGradient3345"> - <stop - id="stop4103" - offset="0" - style="stop-color:#c2ebab;stop-opacity:1;" /> - <stop - id="stop3349" - offset="1" - style="stop-color:#71d03c;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3339"> - <stop - id="stop3341" - offset="0" - style="stop-color:#cbff9c;stop-opacity:1;" /> - <stop - id="stop3343" - offset="1" - style="stop-color:#65c171;stop-opacity:0" /> - </linearGradient> - <linearGradient - id="linearGradient3327"> - <stop - id="stop4095" - offset="0" - style="stop-color:#baff63;stop-opacity:1;" /> - <stop - id="stop4097" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3453" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.1383929,0,-10.517857)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3295" - id="linearGradient3458" - gradientUnits="userSpaceOnUse" - x1="179.17224" - y1="123.75864" - x2="173.98071" - y2="65.448112" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient5446"> - <stop - id="stop5448" - style="stop-color:#FFEA00" - offset="0" /> - <stop - id="stop5450" - style="stop-color:#c66200;stop-opacity:1;" - offset="1" /> - </linearGradient> - <linearGradient - id="linearGradient5412" - gradientUnits="userSpaceOnUse" - x1="28" - y1="57.5" - x2="28" - y2="0"> - <stop - offset="0" - style="stop-color:#fff14d;stop-opacity:1;" - id="stop5414" /> - <stop - offset="1" - style="stop-color:#f8ffa0;stop-opacity:0;" - id="stop5416" /> - </linearGradient> - <linearGradient - id="linearGradient5368"> - <stop - style="stop-color:#0590ff;stop-opacity:1;" - offset="0" - id="stop5370" /> - <stop - style="stop-color:#c6e6ff;stop-opacity:1;" - offset="1" - id="stop5372" /> - </linearGradient> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient4992"> - <stop - id="stop4994" - style="stop-color:#FFEA00" - offset="0" /> - <stop - id="stop4996" - style="stop-color:#ffa000;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="radialGradient3401" - gradientUnits="userSpaceOnUse" - cx="111" - cy="144.49577" - r="139.55859" - gradientTransform="translate(-12,4)" - fx="111" - fy="144.49577" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="radialGradient9890" - gradientUnits="userSpaceOnUse" - cx="138.91406" - cy="148.63283" - r="139.5585" - gradientTransform="translate(-12,4)" - fx="138.91406" - fy="148.63283" /> - <linearGradient - id="linearGradient3443"> - <stop - style="stop-color:#747474;stop-opacity:1;" - offset="0" - id="stop3445" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop4154" /> - </linearGradient> - <radialGradient - gradientUnits="userSpaceOnUse" - r="111.0006" - cy="-9" - cx="51.9995" - id="radialGradient4071" - gradientTransform="translate(-103.157,-34.959)"> - <stop - id="stop2424" - style="stop-color:#80B3FF" - offset="0.15" /> - <stop - id="stop4158" - style="stop-color:#163a66;stop-opacity:1;" - offset="1" /> - </radialGradient> - <linearGradient - id="linearGradient2575" - gradientUnits="userSpaceOnUse" - x1="28" - y1="57.5" - x2="28" - y2="0"> - <stop - offset="0" - style="stop-color:#FFEA00" - id="stop2577" /> - <stop - offset="1" - style="stop-color:#ffa000;stop-opacity:1;" - id="stop2579" /> - </linearGradient> - <linearGradient - y2="65.448112" - x2="173.98071" - y1="123.75864" - x1="179.17224" - gradientUnits="userSpaceOnUse" - id="linearGradient2226" - xlink:href="#linearGradient3295" - inkscape:collect="always" - gradientTransform="translate(-136,-142.00448)" /> - <filter - id="filter3387" - height="1.249912" - y="-0.12495601" - width="1.2041403" - x="-0.10207015" - inkscape:collect="always"> - <feGaussianBlur - id="feGaussianBlur3389" - stdDeviation="0.44655691" - inkscape:collect="always" /> - </filter> - <radialGradient - r="56" - fy="76" - fx="172" - cy="76" - cx="172" - gradientTransform="matrix(1,0,0,1.1383929,-136,-152.52234)" - gradientUnits="userSpaceOnUse" - id="radialGradient3629" - xlink:href="#XMLID_4_" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9792,0,0,0.9725,133.0002,20.8762)" - r="55.148" - cy="-0.2148" - cx="48" - id="XMLID_4_"> - <stop - id="stop3082" - style="stop-color:#72D13D" - offset="0" /> - <stop - id="stop3084" - style="stop-color:#35AC1C" - offset="0.3553" /> - <stop - id="stop3086" - style="stop-color:#0F9508" - offset="0.6194" /> - <stop - id="stop3088" - style="stop-color:#008C00" - offset="0.7574" /> - <stop - id="stop3090" - style="stop-color:#007A00" - offset="1" /> - </radialGradient> - <linearGradient - id="linearGradient3260" - inkscape:collect="always"> - <stop - id="stop3262" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop3264" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3295"> - <stop - id="stop3297" - offset="0" - style="stop-color:#fdff63;stop-opacity:1;" /> - <stop - id="stop3299" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient3751" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,-1.9038358,1.6066243,0,10.102626,349.18714)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient4745" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,-1.9038358,1.6066243,0,10.102626,349.18714)" - cx="172" - cy="76" - fx="172" - fy="76" - r="56" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient3446"> - <stop - id="stop3448" - style="stop-color:#FFEA00" - offset="0" /> - <stop - id="stop4183" - style="stop-color:#FFCC00" - offset="1" /> - </linearGradient> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient3456" - xlink:href="#linearGradient3287" - inkscape:collect="always" /> - <linearGradient - y2="51.1875" - x2="-39.53125" - y1="78" - x1="-39.53125" - gradientTransform="translate(69.54139,-45.18897)" - gradientUnits="userSpaceOnUse" - id="linearGradient4708" - xlink:href="#linearGradient18668" - inkscape:collect="always" /> - <radialGradient - gradientTransform="translate(-157.79665,3.3542977)" - fy="135.7422" - fx="121.14062" - r="139.5585" - cy="135.7422" - cx="121.14062" - gradientUnits="userSpaceOnUse" - id="radialGradient2886" - xlink:href="#XMLID_7_" - inkscape:collect="always" /> - <radialGradient - fy="142.6467" - fx="128.37613" - r="139.55859" - cy="142.6467" - cx="128.37613" - gradientTransform="matrix(1.2968852,0,0,1.439407,-43.366528,-58.450233)" - gradientUnits="userSpaceOnUse" - id="radialGradient2883" - xlink:href="#XMLID_8_" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(69.54139,-45.18897)" - y2="51.1875" - x2="-39.53125" - y1="78" - x1="-39.53125" - gradientUnits="userSpaceOnUse" - id="linearGradient18749" - xlink:href="#linearGradient18668" - inkscape:collect="always" /> - <linearGradient - y2="51.1875" - x2="-39.53125" - y1="78" - x1="-39.53125" - gradientUnits="userSpaceOnUse" - id="linearGradient18746" - xlink:href="#linearGradient18668" - inkscape:collect="always" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient18744" - xlink:href="#XMLID_2_" - inkscape:collect="always" /> - <linearGradient - y2="51.1875" - x2="-39.53125" - y1="78" - x1="-39.53125" - gradientUnits="userSpaceOnUse" - id="linearGradient18674" - xlink:href="#linearGradient18668" - inkscape:collect="always" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient18649"> - <stop - id="stop18651" - style="stop-color:#FFEA00" - offset="0" /> - <stop - id="stop18653" - style="stop-color:#FFCC00" - offset="1" /> - </linearGradient> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient18657" - xlink:href="#XMLID_2_" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.754978,-2.959381e-2,0,0.905772,7.650275,10.87807)" - r="8.968153" - fy="31.045055" - fx="26.954102" - cy="31.045055" - cx="26.954102" - id="radialGradient15986" - xlink:href="#linearGradient15967" - inkscape:collect="always" /> - <linearGradient - y2="100.82378" - x2="-18.121965" - y1="100.82378" - x1="-74.820707" - gradientUnits="userSpaceOnUse" - id="linearGradient15977" - xlink:href="#linearGradient2309" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(1.470416e-5,0)" - y2="30.441185" - x2="27.719746" - y1="7.881104" - x1="27.719746" - gradientUnits="userSpaceOnUse" - id="linearGradient15973" - xlink:href="#linearGradient15967" - inkscape:collect="always" /> - <linearGradient - y2="100.82378" - x2="-18.121965" - y1="100.82378" - x1="-74.820707" - gradientUnits="userSpaceOnUse" - id="linearGradient14189" - xlink:href="#linearGradient2309" - inkscape:collect="always" /> - <linearGradient - y2="100.82378" - x2="-18.121965" - y1="100.82378" - x1="-74.820707" - gradientUnits="userSpaceOnUse" - id="linearGradient14180" - xlink:href="#linearGradient2309" - inkscape:collect="always" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient12378" - xlink:href="#XMLID_2_" - inkscape:collect="always" /> - <foreignObject - id="foreignObject4205" - height="1" - width="1" - y="0" - x="0" - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf" /> - </foreignObject> - <radialGradient - r="139.55859" - cy="112.3047" - cx="102" - gradientUnits="userSpaceOnUse" - id="radialGradient2467" - xlink:href="#XMLID_8_" - inkscape:collect="always" /> - <radialGradient - r="139.5585" - cy="112.3047" - cx="102" - gradientUnits="userSpaceOnUse" - id="radialGradient2465" - xlink:href="#XMLID_7_" - inkscape:collect="always" /> - <linearGradient - y2="96.0002" - x2="88.0002" - y1="104" - x1="96" - gradientUnits="userSpaceOnUse" - id="linearGradient2397" - xlink:href="#XMLID_12_" - inkscape:collect="always" /> - <linearGradient - y2="95.293" - x2="87.293" - y1="103" - x1="95" - gradientUnits="userSpaceOnUse" - id="linearGradient2395" - xlink:href="#XMLID_11_" - inkscape:collect="always" /> - <linearGradient - y2="94.5865" - x2="86.5865" - y1="103" - x1="95" - gradientUnits="userSpaceOnUse" - id="linearGradient2393" - xlink:href="#XMLID_10_" - inkscape:collect="always" /> - <linearGradient - y2="94.5366" - x2="86.5356" - y1="102.3447" - x1="94.3438" - gradientUnits="userSpaceOnUse" - id="linearGradient2391" - xlink:href="#XMLID_9_" - inkscape:collect="always" /> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="XMLID_2_"> - <stop - id="stop12" - style="stop-color:#FFEA00" - offset="0" /> - <stop - id="stop14" - style="stop-color:#FFCC00" - offset="1" /> - </linearGradient> - <linearGradient - id="linearGradient15967" - gradientUnits="userSpaceOnUse" - x1="28" - y1="57.5" - x2="28" - y2="0"> - <stop - offset="0" - style="stop-color:white;stop-opacity:1;" - id="stop15969" /> - <stop - offset="1" - style="stop-color:white;stop-opacity:0;" - id="stop15971" /> - </linearGradient> - <linearGradient - id="linearGradient18668" - gradientUnits="userSpaceOnUse" - x1="28" - y1="57.5" - x2="28" - y2="0"> - <stop - offset="0" - style="stop-color:#fff8a8;stop-opacity:1;" - id="stop18670" /> - <stop - offset="1" - style="stop-color:white;stop-opacity:0;" - id="stop18672" /> - </linearGradient> - <linearGradient - id="linearGradient4222"> - <stop - id="stop4007" - offset="0" - style="stop-color:black;stop-opacity:1" /> - <stop - id="stop4009" - offset="1" - style="stop-color:black;stop-opacity:0" /> - </linearGradient> - <linearGradient - id="linearGradient3287" - gradientUnits="userSpaceOnUse" - x1="28" - y1="57.5" - x2="28" - y2="0"> - <stop - offset="0" - style="stop-color:#FFEA00" - id="stop3289" /> + id="stop3178" /> <stop + style="stop-color:#6f9afa;stop-opacity:1;" offset="1" - style="stop-color:#ffa000;stop-opacity:1;" - id="stop3291" /> + id="stop3180" /> </linearGradient> <linearGradient - id="linearGradient3030" - inkscape:collect="always"> + id="linearGradient3168"> <stop - id="stop3032" + style="stop-color:#3a78be;stop-opacity:1;" offset="0" - style="stop-color:#000000;stop-opacity:0.77902622" /> + id="stop3170" /> <stop - id="stop3034" + style="stop-color:#6f9afa;stop-opacity:1;" offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - y2="0" - x2="28" - y1="57.5" - x1="28" - gradientUnits="userSpaceOnUse" - id="linearGradient3109"> - <stop - id="stop3111" - style="stop-color:#fff8a8;stop-opacity:1;" - offset="0" /> - <stop - id="stop3113" - style="stop-color:white;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="linearGradient4226" - gradientTransform="scale(1.039383,0.9621093)" - x1="64.341991" - y1="18.50366" - x2="76.284438" - y2="18.50366" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="linearGradient4228" - x1="79.75" - y1="84" - x2="120.25" - y2="84" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#radialGradient3696" - id="linearGradient4230" - gradientUnits="userSpaceOnUse" - x1="100" - y1="56" - x2="96" - y2="108" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient4232" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(144,0)" - x1="-13.757333" - y1="76.708466" - x2="-62.424866" - y2="104.80668" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4234" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4236" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5412" - id="linearGradient4238" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="linearGradient4240" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.039383,0.9621093)" - x1="64.341991" - y1="18.50366" - x2="76.284438" - y2="18.50366" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4242" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3030" - id="radialGradient4244" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(144,0)" - cx="-44" - cy="84" - fx="-60" - fy="100" - r="24" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4246" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient4248" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(144,0)" - cx="-44" - cy="84" - fx="-40" - fy="96" - r="20" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3202" - id="linearGradient4250" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(81.3125,0)" - x1="11.68106" - y1="60.539303" - x2="11.68106" - y2="108.0104" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4252" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(81.302365,0)" - x1="6.6976352" - y1="52" - x2="11.68106" - y2="96.001434" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient4254" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(81.302365,0)" - x1="26.697636" - y1="96" - x2="14.697635" - y2="72" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="linearGradient4256" - gradientUnits="userSpaceOnUse" - x1="79.75" - y1="84" - x2="120.25" - y2="84" /> - <linearGradient - inkscape:collect="always" - xlink:href="#radialGradient3696" - id="linearGradient4301" - gradientUnits="userSpaceOnUse" - x1="100" - y1="56" - x2="96" - y2="108" - gradientTransform="translate(-138.69812,17.039832)" /> - <radialGradient - r="165.9342" - cy="114" - cx="112.667" - gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" - gradientUnits="userSpaceOnUse" - id="radialGradient3944" - xlink:href="#XMLID_8_" - inkscape:collect="always" /> - <linearGradient - y2="36.313725" - x2="42.708179" - y1="123.58058" - x1="63.109283" - gradientTransform="matrix(1.002688,0,0,1.002688,154.5853,71.015)" - gradientUnits="userSpaceOnUse" - id="linearGradient3895" - xlink:href="#linearGradient2257" - inkscape:collect="always" /> - <linearGradient - y2="84.336159" - x2="61.060928" - y1="67.373436" - x1="61.060928" - gradientTransform="matrix(1.002688,0,0,1.002688,154.5853,71.015)" - gradientUnits="userSpaceOnUse" - id="linearGradient3892" - xlink:href="#linearGradient3194" - inkscape:collect="always" /> - <linearGradient - y2="33.424469" - x2="37.203804" - y1="165.6929" - x1="76.601013" - gradientTransform="matrix(1.002688,0,0,0.298658,154.5853,104.571)" - gradientUnits="userSpaceOnUse" - id="linearGradient3889" - xlink:href="#linearGradient2257" - inkscape:collect="always" /> - <linearGradient - y2="63.31934" - x2="103.77021" - y1="42.13184" - x1="119.58964" - gradientTransform="translate(153.2054,69.33982)" - gradientUnits="userSpaceOnUse" - id="linearGradient3868" - xlink:href="#linearGradient3654" - inkscape:collect="always" /> - <linearGradient - y2="59.734375" - x2="103.28125" - y1="52.859375" - x1="112.39521" - gradientTransform="translate(153.2054,69.33982)" - gradientUnits="userSpaceOnUse" - id="linearGradient3865" - xlink:href="#linearGradient3654" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3654"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3656" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3658" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3272"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3274" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3276" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3194"> - <stop - style="stop-color:#967239;stop-opacity:1;" - offset="0" - id="stop3196" /> - <stop - style="stop-color:#967239;stop-opacity:0;" - offset="1" - id="stop3198" /> - </linearGradient> - <linearGradient - id="linearGradient5242"> - <stop - style="stop-color:#180f00;stop-opacity:1;" - offset="0" - id="stop5244" /> - <stop - style="stop-color:#613e00;stop-opacity:0;" - offset="1" - id="stop5246" /> - </linearGradient> - <linearGradient - id="linearGradient2257"> - <stop - id="stop2259" - offset="0" - style="stop-color:#8f6b32;stop-opacity:1;" /> - <stop - id="stop2261" - offset="1" - style="stop-color:#debc85;stop-opacity:1;" /> - </linearGradient> - <linearGradient - y2="73.116" - x2="71.615" - y1="63.1162" - x1="68.6152" - gradientUnits="userSpaceOnUse" - id="XMLID_103_"> - <stop - id="stop2217" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2219" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="67.3014" - x2="77.0967" - y1="58.3008" - x1="74.0967" - gradientUnits="userSpaceOnUse" - id="XMLID_104_"> - <stop - id="stop2224" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2226" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="63.2474" - x2="84.3804" - y1="53.2485" - x1="80.3809" - gradientUnits="userSpaceOnUse" - id="XMLID_105_"> - <stop - id="stop2231" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2233" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="61.9248" - x2="90.7354" - y1="49.8486" - x1="89.1709" - gradientUnits="userSpaceOnUse" - id="XMLID_106_"> - <stop - id="stop2238" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2240" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="58.8364" - x2="98.8974" - y1="47.8369" - x1="96.8975" - gradientUnits="userSpaceOnUse" - id="XMLID_107_"> - <stop - id="stop2245" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2247" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-0.894 0.4481 0.4481 0.894 102.4965 -24.3783)" - y2="71.4501" - x2="82.7584" - y1="64.792" - x1="81.4268" - gradientUnits="userSpaceOnUse" - id="XMLID_111_"> - <stop - id="stop2273" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2275" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="70.9013" - x2="55.8886" - y1="61.9019" - x1="54.8887" - gradientUnits="userSpaceOnUse" - id="XMLID_112_"> - <stop - id="stop2280" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2282" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-0.5962 0.8028 0.8028 0.5962 60.4483 -34.8312)" - y2="51.5712" - x2="84.3951" - y1="44.9131" - x1="83.0635" - gradientUnits="userSpaceOnUse" - id="XMLID_113_"> - <stop - id="stop2287" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2289" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-0.4243 0.9055 0.9055 0.4243 41.46 -36.3299)" - y2="43.1339" - x2="84.7196" - y1="36.4746" - x1="83.3877" - gradientUnits="userSpaceOnUse" - id="XMLID_114_"> - <stop - id="stop2294" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2296" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-0.2556 0.9668 0.9668 0.2556 25.5372 -35.9141)" - y2="35.1793" - x2="85.3436" - y1="28.52" - x1="84.0117" - gradientUnits="userSpaceOnUse" - id="XMLID_115_"> - <stop - id="stop2301" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2303" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-0.0825 0.9966 0.9966 0.0825 10.3161 -34.5121)" - y2="26.6608" - x2="85.6707" - y1="20.0015" - x1="84.3389" - gradientUnits="userSpaceOnUse" - id="XMLID_116_"> - <stop - id="stop2308" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2310" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="113.3099" - x2="67.8624" - y1="106.6494" - x1="66.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_119_"> - <stop - id="stop2329" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2331" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-1 0 0 1 134 0)" - y2="117.3097" - x2="73.8621" - y1="110.6504" - x1="72.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_120_"> - <stop - id="stop2336" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2338" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="105.3099" - x2="67.8624" - y1="98.6494" - x1="66.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_121_"> - <stop - id="stop2343" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2345" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-1 0 0 1 134 0)" - y2="109.3113" - x2="73.8619" - y1="102.6484" - x1="72.5293" - gradientUnits="userSpaceOnUse" - id="XMLID_122_"> - <stop - id="stop2350" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2352" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="121.3099" - x2="67.8614" - y1="114.6494" - x1="66.5293" - gradientUnits="userSpaceOnUse" - id="XMLID_123_"> - <stop - id="stop2357" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2359" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="89.3099" - x2="67.8624" - y1="82.6494" - x1="66.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_125_"> - <stop - id="stop2371" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2373" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-1 0 0 1 134 0)" - y2="93.3099" - x2="73.8614" - y1="86.6494" - x1="72.5293" - gradientUnits="userSpaceOnUse" - id="XMLID_126_"> - <stop - id="stop2378" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2380" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="81.3101" - x2="67.8616" - y1="74.6484" - x1="66.5293" - gradientUnits="userSpaceOnUse" - id="XMLID_127_"> - <stop - id="stop2385" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2387" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-1 0 0 1 134 0)" - y2="85.3097" - x2="73.8612" - y1="78.6504" - x1="72.5293" - gradientUnits="userSpaceOnUse" - id="XMLID_128_"> - <stop - id="stop2392" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2394" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="97.3099" - x2="67.8624" - y1="90.6494" - x1="66.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_129_"> - <stop - id="stop2399" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2401" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(-1 0 0 1 134 0)" - y2="101.3107" - x2="73.8621" - y1="94.6514" - x1="72.5303" - gradientUnits="userSpaceOnUse" - id="XMLID_130_"> - <stop - id="stop2406" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2408" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0002" - x2="70.1992" - y1="57.9995" - x1="70.1992" - gradientUnits="userSpaceOnUse" - id="XMLID_131_"> - <stop - id="stop2413" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2415" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0007" - x2="75.5947" - y1="58" - x1="75.5947" - gradientUnits="userSpaceOnUse" - id="XMLID_132_"> - <stop - id="stop2420" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2422" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="118.9961" - x2="82.4727" - y1="58" - x1="82.4727" - gradientUnits="userSpaceOnUse" - id="XMLID_133_"> - <stop - id="stop2427" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2429" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="118.9998" - x2="89.8066" - y1="57.9995" - x1="89.8066" - gradientUnits="userSpaceOnUse" - id="XMLID_134_"> - <stop - id="stop2434" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2436" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119" - x2="97.7725" - y1="57.9995" - x1="97.7725" - gradientUnits="userSpaceOnUse" - id="XMLID_135_"> - <stop - id="stop2441" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2443" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0002" - x2="59.3667" - y1="57.9995" - x1="59.3667" - gradientUnits="userSpaceOnUse" - id="XMLID_139_"> - <stop - id="stop2469" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2471" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0003" - x2="55.313" - y1="57.9995" - x1="55.313" - gradientUnits="userSpaceOnUse" - id="XMLID_140_"> - <stop - id="stop2476" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2478" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="118.9997" - x2="48.5864" - y1="57.9995" - x1="48.5864" - gradientUnits="userSpaceOnUse" - id="XMLID_141_"> - <stop - id="stop2483" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2485" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0007" - x2="41.0347" - y1="58" - x1="41.0347" - gradientUnits="userSpaceOnUse" - id="XMLID_142_"> - <stop - id="stop2490" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2492" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0001" - x2="33.7886" - y1="57.9995" - x1="33.7886" - gradientUnits="userSpaceOnUse" - id="XMLID_143_"> - <stop - id="stop2497" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2499" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0007" - x2="25.5942" - y1="58" - x1="25.5942" - gradientUnits="userSpaceOnUse" - id="XMLID_144_"> - <stop - id="stop2504" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2506" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0009" - x2="67" - y1="58.0005" - x1="67" - gradientUnits="userSpaceOnUse" - id="XMLID_147_"> - <stop - id="stop2525" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2527" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="119.0009" - x2="60.9995" - y1="58.0005" - x1="60.9995" - gradientUnits="userSpaceOnUse" - id="XMLID_148_"> - <stop - id="stop2532" - style="stop-color:#EEEEEC" - offset="0.0506" /> - <stop - id="stop2534" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="103.9829" - x2="68.4149" - y1="67.6123" - x1="60.3325" - gradientUnits="userSpaceOnUse" - id="XMLID_159_"> - <stop - id="stop2560" - style="stop-color:#515151;stop-opacity:1;" - offset="0.0506" /> - <stop - id="stop2562" - style="stop-color:#343633;stop-opacity:1;" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#555753" - offset="1" /> - </linearGradient> - <linearGradient - y2="82.8864" - x2="68.8911" - y1="67.8857" - x1="56.8906" - gradientUnits="userSpaceOnUse" - id="XMLID_160_"> - <stop - id="stop2567" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2569" - style="stop-color:#373836;stop-opacity:1;" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#555753" - offset="1" /> - </linearGradient> - <linearGradient - y2="83.6237" - x2="67.0498" - y1="69.625" - x1="62.0503" - gradientUnits="userSpaceOnUse" - id="XMLID_161_"> - <stop - id="stop2574" - style="stop-color:#FFFFFF" - offset="0" /> - <stop - id="stop2576" - style="stop-color:#FAFAFA" - offset="0.1332" /> - <stop - id="stop2578" - style="stop-color:#ECEDEC" - offset="0.2876" /> - <stop - id="stop2580" - style="stop-color:#D5D6D5" - offset="0.4525" /> - <stop - id="stop2582" - style="stop-color:#B5B6B4" - offset="0.6249" /> - <stop - id="stop2584" - style="stop-color:#8C8D8A" - offset="0.8032" /> - <stop - id="stop2586" - style="stop-color:#5A5C58" - offset="0.9838" /> - <stop - id="stop2588" - style="stop-color:#555753" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.6765" /> - <a:midPointStop - style="stop-color:#555753" - offset="1" /> - </linearGradient> - <linearGradient - y2="79.093" - x2="64.5422" - y1="74.0918" - x1="63.542" - gradientUnits="userSpaceOnUse" - id="XMLID_162_"> - <stop - id="stop2593" - style="stop-color:#a9ada4;stop-opacity:1;" - offset="0" /> - <stop - id="stop2595" - style="stop-color:#3f403d;stop-opacity:1;" - offset="1" /> - <a:midPointStop - style="stop-color:#BABDB6" - offset="0" /> - <a:midPointStop - style="stop-color:#BABDB6" - offset="0.5" /> - <a:midPointStop - style="stop-color:#555753" - offset="1" /> - </linearGradient> - <linearGradient - y2="101.0992" - x2="68.3162" - y1="83.0986" - x1="61.3159" - gradientUnits="userSpaceOnUse" - id="XMLID_163_"> - <stop - id="stop2600" - style="stop-color:#FFFFFF" - offset="0.0056" /> - <stop - id="stop2602" - style="stop-color:#F0F0F0" - offset="0.1352" /> - <stop - id="stop2604" - style="stop-color:#CACAC9" - offset="0.384" /> - <stop - id="stop2606" - style="stop-color:#8C8D8B" - offset="0.7233" /> - <stop - id="stop2608" - style="stop-color:#555753" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.0056" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5618" /> - <a:midPointStop - style="stop-color:#555753" - offset="1" /> - </linearGradient> - <linearGradient - y2="107.8077" - x2="67.7616" - y1="77.5322" - x1="61.7065" - gradientUnits="userSpaceOnUse" - id="XMLID_164_"> - <stop - id="stop2613" - style="stop-color:#EEEEEC" - offset="0" /> - <stop - id="stop2615" - style="stop-color:#BABDB6" - offset="1" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0" /> - <a:midPointStop - style="stop-color:#EEEEEC" - offset="0.5" /> - <a:midPointStop - style="stop-color:#BABDB6" - offset="1" /> - </linearGradient> - <linearGradient - y2="76" - x2="66" - y1="76" - x1="62" - gradientUnits="userSpaceOnUse" - id="XMLID_165_"> - <stop - id="stop2620" - style="stop-color:#FFFFFF" - offset="0.0506" /> - <stop - id="stop2622" - style="stop-color:#D3D7CF" - offset="0.9326" /> - <stop - id="stop2624" - style="stop-color:#888A85" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#D3D7CF" - offset="0.9326" /> - <a:midPointStop - style="stop-color:#D3D7CF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#888A85" - offset="1" /> - </linearGradient> - <linearGradient - y2="80.9765" - x2="65.1059" - y1="71.9766" - x1="63.106" - gradientUnits="userSpaceOnUse" - id="XMLID_166_"> - <stop - id="stop2629" - style="stop-color:#FFFFFF" - offset="0.0506" /> - <stop - id="stop2631" - style="stop-color:#D3D7CF" - offset="1" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.0506" /> - <a:midPointStop - style="stop-color:#FFFFFF" - offset="0.5" /> - <a:midPointStop - style="stop-color:#D3D7CF" - offset="1" /> + id="stop3172" /> </linearGradient> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient2257" + xlink:href="#linearGradient3168" id="linearGradient3174" - x1="63.109283" - y1="123.58058" - x2="42.708179" - y2="36.313725" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.002688,0,0,1.002688,-12.92013,1.675182)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3194" - id="linearGradient3200" - x1="61.060928" - y1="67.373436" - x2="61.060928" - y2="84.336159" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.002688,0,0,1.002688,-12.92013,1.675182)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2257" - id="linearGradient3202" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.002688,0,0,0.298658,-12.92013,35.23114)" - x1="76.601013" - y1="165.6929" - x2="37.203804" - y2="33.424469" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3280" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3282" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3284" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3286" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3288" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3290" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient3292" - gradientUnits="userSpaceOnUse" - x1="106.37579" - y1="-8.5763578" - x2="21.697437" - y2="138.35936" /> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject3305"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf" /> - </foreignObject> - <radialGradient - id="XMLID_5_" - cx="51.9995" - cy="-9" - r="111.0006" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(18.73145,-130.4544)"> - <stop - offset="0.15" - style="stop-color:#80B3FF" - id="stop3312" /> - <stop - offset="0.316" - style="stop-color:#69A1F0" - id="stop3314" /> - <stop - offset="0.6029" - style="stop-color:#4888DA" - id="stop3316" /> - <stop - offset="0.8412" - style="stop-color:#3378CC" - id="stop3318" /> - <stop - offset="1" - style="stop-color:#2C72C7" - id="stop3320" /> - </radialGradient> - <linearGradient - id="linearGradient3670" - gradientUnits="userSpaceOnUse" - x1="63.9995" - y1="25.1577" - x2="63.9995" - y2="157.6319" - gradientTransform="translate(18.73145,-130.4544)"> - <stop - offset="0" - style="stop-color:#BFD9FF" - id="stop3374" /> - <stop - offset="0.2189" - style="stop-color:#80B3FF" - id="stop3376" /> - <stop - offset="0.2933" - style="stop-color:#6EA5F3" - id="stop3378" /> - <stop - offset="0.4426" - style="stop-color:#3E80D3" - id="stop3380" /> - <stop - offset="0.4941" - style="stop-color:#2C72C7" - id="stop3382" /> - <stop - offset="0.7" - style="stop-color:#00438A" - id="stop3384" /> - </linearGradient> - <linearGradient - id="linearGradient3678" - gradientUnits="userSpaceOnUse" - x1="-37.875" - y1="48.787102" - x2="230.237" - y2="48.787102" - gradientTransform="translate(18.73145,-130.4544)"> - <stop - offset="0" - style="stop-color:#2C72C7" - id="stop3389" /> - <stop - offset="0.2959" - style="stop-color:#FFFFFF" - id="stop3391" /> - <stop - offset="1" - style="stop-color:#2C72C7" - id="stop3393" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_5_" - id="radialGradient3616" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(18.73145,-130.4544)" - cx="51.9995" - cy="-9" - r="111.0006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="linearGradient3618" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(18.73145,-130.4544)" - x1="63.9995" - y1="25.1577" - x2="63.9995" - y2="157.6319" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="linearGradient3620" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(18.73145,-130.4544)" - x1="-37.875" - y1="48.787102" - x2="230.237" - y2="48.787102" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3654" - id="linearGradient3660" - x1="112.39521" - y1="52.859375" - x2="103.28125" - y2="59.734375" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-14.3,0)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3654" - id="linearGradient3662" - x1="119.58964" - y1="42.13184" - x2="103.77021" - y2="63.31934" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-14.3,0)" /> - <linearGradient - id="linearGradient2403"> - <stop - style="stop-color:#28691f;stop-opacity:1;" - offset="0" - id="stop2405" /> - <stop - style="stop-color:#42ad33;stop-opacity:1;" - offset="1" - id="stop2407" /> - </linearGradient> - <linearGradient - id="linearGradient2389"> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0" - id="stop2391" /> - <stop - id="stop2393" - offset="0.4375" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0.56588125" - id="stop2395" /> - <stop - id="stop2423" - offset="0.76237977" - style="stop-color:#000000;stop-opacity:0.24705882;" /> - <stop - id="stop2421" - offset="0.77884614" - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0.875" - id="stop2397" /> - <stop - id="stop2411" - offset="0.875" - style="stop-color:#000000;stop-opacity:0.49803922;" /> - <stop - id="stop3938" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient2362"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2364" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop2366" /> - </linearGradient> - <linearGradient - id="linearGradient2321"> - <stop - style="stop-color:#c3c3c3;stop-opacity:1;" - offset="0" - id="stop2323" /> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="1" - id="stop2325" /> - </linearGradient> - <linearGradient - id="linearGradient2287"> - <stop - id="stop2299" - offset="0" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="0.4375" - id="stop2307" /> - <stop - id="stop2309" - offset="0.58240438" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0.49803922;" - offset="0.76442307" - id="stop2419" /> - <stop - id="stop3918" - offset="0.875" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:0.49803922;" - offset="0.91826922" - id="stop3920" /> - <stop - id="stop2417" - offset="0.96048182" - style="stop-color:#000000;stop-opacity:0;" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop2291" /> - </linearGradient> - <linearGradient - id="linearGradient3325"> - <stop - id="stop3327" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop3329" - offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3311"> - <stop - style="stop-color:#2d2d2d;stop-opacity:1;" - offset="0" - id="stop3313" /> - <stop - id="stop3319" - offset="0.5" - style="stop-color:#000000;stop-opacity:1;" /> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="1" - id="stop1492" /> - </linearGradient> - <linearGradient - id="linearGradient3303"> - <stop - style="stop-color:#ffffff;stop-opacity:0.68345326;" - offset="0" - id="stop3305" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3307" /> - </linearGradient> - <linearGradient - id="linearGradient3273"> - <stop - style="stop-color:#ffffff;stop-opacity:0.55035973;" - offset="0" - id="stop3275" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3277" /> - </linearGradient> - <linearGradient - id="linearGradient3259"> - <stop - id="stop3261" - offset="0" - style="stop-color:#ffffff;stop-opacity:0.55035973;" /> - <stop - id="stop3263" - offset="1" - style="stop-color:#000000;stop-opacity:0;" /> - </linearGradient> - <linearGradient - id="linearGradient3251"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3253" /> - <stop - style="stop-color:#131313;stop-opacity:0;" - offset="1" - id="stop3255" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3235"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3237" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop3239" /> - </linearGradient> - <linearGradient - id="linearGradient3225"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3227" /> - <stop - style="stop-color:#aeaeae;stop-opacity:1;" - offset="1" - id="stop3229" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3217"> - <stop - style="stop-color:#252525;stop-opacity:1;" - offset="0" - id="stop3219" /> - <stop - style="stop-color:#252525;stop-opacity:0;" - offset="1" - id="stop3221" /> - </linearGradient> - <linearGradient - id="linearGradient3207"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop3209" /> - <stop - style="stop-color:#252525;stop-opacity:0;" - offset="1" - id="stop3211" /> - </linearGradient> - <linearGradient - id="linearGradient3876"> - <stop - style="stop-color:#b4942a;stop-opacity:1;" - offset="0" - id="stop3878" /> - <stop - style="stop-color:#e4dcc9;stop-opacity:1" - offset="1" - id="stop3880" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient1527" - cx="63.912209" - cy="115.70919" - fx="63.912209" - fy="115.7093" - r="63.912209" - gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" + x1="386.89221" + y1="703.53375" + x2="386.89221" + y2="252.50571" gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2257" - id="radialGradient1405" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.519831,9.412826e-2,-0.895354,13.78472,115.1882,-1545.166)" - cx="42.617531" - cy="120.64188" - fx="42.617531" - fy="120.64188" - r="3.406888" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3311" - id="radialGradient1407" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.22884e-2,-1.47547e-4,1.889714e-3,0.798624,69.12243,5.487066)" - cx="95.505852" - cy="59.591507" - fx="95.505852" - fy="59.591507" - r="47.746404" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="radialGradient1409" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297066,3.012623e-3,-1.134728e-3,0.488669,7.096503,-13.69501)" - cx="49.009884" - cy="8.4953122" - fx="47.370888" - fy="6.7701697" - r="3.9750405" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3217" - id="linearGradient1411" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-3.693584e-16,3.693584e-16,1.29707,7.064707,-20.57911)" - x1="48.914677" - y1="2.9719031" - x2="48.913002" - y2="2.5548496" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="radialGradient1413" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-4.501275e-16,6.640356e-17,0.1578,7.064707,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> + xlink:href="#linearGradient3176" + id="linearGradient3182" + x1="387.41043" + y1="501.67398" + x2="387.41043" + y2="252.02386" + gradientUnits="userSpaceOnUse" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3235" - id="linearGradient1415" + xlink:href="#linearGradient3176" + id="linearGradient3035" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297066,3.012623e-3,-3.012623e-3,1.297066,7.112448,-20.56258)" - x1="48.498562" - y1="0.81150496" - x2="48.732723" - y2="2.3657269" /> + x1="387.41043" + y1="501.67398" + x2="387.41043" + y2="252.02386" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient1417" + xlink:href="#linearGradient3168" + id="linearGradient3037" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.28993,-5.022494e-16,5.050298e-16,1.29707,7.402337,-20.57911)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3273" - id="radialGradient1419" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.860164,-2.800126e-16,6.473209e-17,0.1578,24.75801,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient1421" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.279856,4.983275e-16,-5.050298e-16,1.29707,-133.3868,-20.57911)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3259" - id="radialGradient1423" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.853446,3.872019e-16,-5.817635e-17,0.1578,-116.1668,-17.56653)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3303" - id="radialGradient1425" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,7.573576e-17,-1.374554e-18,2.608014e-2,-7.697455e-14,7.26766)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595197" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3325" - id="radialGradient1427" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595196" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3259" - id="radialGradient1433" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.853446,3.879821e-16,-5.832064e-17,0.1578,-115.9141,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient1436" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.279856,4.994967e-16,-5.062158e-16,1.29707,-133.1341,-10.31269)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3273" - id="radialGradient1439" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.860164,-2.80798e-16,6.487638e-17,0.1578,24.50481,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3251" - id="linearGradient1442" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.28993,-5.034291e-16,5.062158e-16,1.29707,7.14915,-10.31269)" - x1="46.051746" - y1="3.0999987" - x2="46.051746" - y2="2.395859" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3235" - id="linearGradient1445" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297068,-1.880044e-3,1.880044e-3,1.297068,6.796523,-10.3225)" - x1="48.498562" - y1="0.81150496" - x2="48.732723" - y2="2.3657269" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="radialGradient1448" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-4.513135e-16,6.654785e-17,0.1578,6.81152,-7.300115)" - cx="49.011971" - cy="2.6743078" - fx="49.011971" - fy="2.6743078" - r="1.7246193" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3217" - id="linearGradient1451" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.29707,-3.705444e-16,3.705444e-16,1.29707,6.81152,-10.31269)" - x1="48.914677" - y1="2.9719031" - x2="48.913002" - y2="2.5548496" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="radialGradient1455" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.297068,-1.880044e-3,7.085819e-4,0.48867,6.806484,-3.45491)" - cx="49.009884" - cy="8.4953122" - fx="47.370888" - fy="6.7701697" - r="3.9750405" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3311" - id="radialGradient1462" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(6.228741e-2,-3.825032e-4,4.90218e-3,0.798611,68.90433,5.49306)" - cx="95.505852" - cy="59.591507" - fx="95.505852" - fy="59.591507" - r="47.746404" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2257" - id="radialGradient1466" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.520175,8.839467e-2,-0.843351,13.788,109.1206,-1545.323)" - cx="42.617531" - cy="120.64188" - fx="42.617531" - fy="120.64188" - r="3.406888" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3325" - id="radialGradient1470" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.511766,-6.865741e-3,4.187271e-5,-9.110636e-3,87.10184,7.76835)" - cx="34.677639" - cy="7.4622769" - fx="34.677639" - fy="7.4622769" - r="47.595196" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2362" - id="linearGradient2368" - x1="74.332748" - y1="17.912012" - x2="54.983063" - y2="90.126022" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.180422,0,0,1.180422,-10.39088,-10.58642)" /> - <linearGradient - id="linearGradient7281"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000" - offset="0.0000000" - id="stop7283" /> - <stop - style="stop-color:#ffffff;stop-opacity:0.0000000" - offset="1.0000000" - id="stop7285" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient4000" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" - cx="63.912209" - cy="115.70919" - fx="63.912209" - fy="115.7093" - r="63.912209" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2287" - id="radialGradient4022" - gradientUnits="userSpaceOnUse" - cx="95.796135" - cy="56.931728" - fx="95.990845" - fy="39.602753" - r="47.11924" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient4024" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" - cx="63.912209" - cy="115.70919" - fx="63.912209" - fy="115.7093" - r="63.912209" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2321" - id="linearGradient4026" - gradientUnits="userSpaceOnUse" - x1="-42.789177" - y1="82.913582" - x2="229.1772" - y2="81.155327" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2389" - id="radialGradient4028" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165294,0,0,1.180294,-9.816118,-9.597466)" - cx="59.385818" - cy="52.046673" - fx="59.385818" - fy="52.046673" - r="43.225086" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2403" - id="linearGradient4030" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.065955,0,0,1.065955,-4.218613,-1.697485)" - x1="97.124756" - y1="99.590462" - x2="33.355057" - y2="22.203432" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2362" - id="linearGradient4032" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.258277,0,0,1.258277,-15.29483,-12.98214)" - x1="74.514832" - y1="17.232468" - x2="52.587749" - y2="99.06546" /> - <linearGradient - y2="88.207977" - x2="48.083496" - y1="-90.602264" - x1="118.66905" - gradientTransform="translate(-5.417988,-3.386244)" - gradientUnits="userSpaceOnUse" - id="linearGradient3137" - xlink:href="#linearGradient3061" - inkscape:collect="always" /> - <radialGradient - gradientTransform="matrix(1.49967,0,0,1.49967,-37.73576,-32.15645)" - gradientUnits="userSpaceOnUse" - r="165.9342" - cy="114" - cx="112.667" - id="XMLID_8_"> - <stop - id="stop54" - style="stop-color:#888A85" - offset="0.0056" /> - <stop - id="stop56" - style="stop-color:#EEEEEC" - offset="1" /> - </radialGradient> - <radialGradient - gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" - gradientUnits="userSpaceOnUse" - r="165.9343" - cy="114" - cx="113.0986" - id="XMLID_9_"> - <stop - id="stop63" - style="stop-color:#888A85" - offset="0.0056" /> - <stop - id="stop65" - style="stop-color:#EEEEEC" - offset="1" /> - </radialGradient> - <radialGradient - gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" - gradientUnits="userSpaceOnUse" - r="165.9342" - cy="114" - cx="110.4854" - id="XMLID_10_"> - <stop - id="stop72" - style="stop-color:#888A85" - offset="0.0056" /> - <stop - id="stop74" - style="stop-color:#EEEEEC" - offset="1" /> - </radialGradient> - <radialGradient - spreadMethod="reflect" - r="28.118999" - fy="58.278419" - fx="70.758911" - cy="78.297623" - cx="57.985786" - gradientTransform="matrix(1.057844,0.272492,-0.841932,3.268475,46.39208,-183.0869)" - gradientUnits="userSpaceOnUse" - id="radialGradient3119" - xlink:href="#linearGradient3044" - inkscape:collect="always" /> - <radialGradient - gradientUnits="userSpaceOnUse" - r="164.7558" - cy="121" - cx="98" - id="XMLID_11_"> - <stop - id="stop81" - style="stop-color:#00438A" - offset="0" /> - <stop - id="stop83" - style="stop-color:#04468C" - offset="0.0429" /> - <stop - id="stop85" - style="stop-color:#0E4E92" - offset="0.0808" /> - <stop - id="stop87" - style="stop-color:#205C9C" - offset="0.1168" /> - <stop - id="stop89" - style="stop-color:#3A6FAA" - offset="0.1517" /> - <stop - id="stop91" - style="stop-color:#5B88BC" - offset="0.1858" /> - <stop - id="stop93" - style="stop-color:#82A6D2" - offset="0.2188" /> - <stop - id="stop95" - style="stop-color:#A4C0E4" - offset="0.2426" /> - <stop - id="stop97" - style="stop-color:#00438A" - offset="1" /> - </radialGradient> - <linearGradient - y2="105.4987" - x2="95.420601" - y1="95.725601" - x1="85.647499" - gradientUnits="userSpaceOnUse" - id="XMLID_12_"> - <stop - id="stop102" - style="stop-color:#FFFFFF" - offset="0.3" /> - <stop - id="stop104" - style="stop-color:#EEEEEE" - offset="0.6036" /> - <stop - id="stop106" - style="stop-color:#CDCDCD" - offset="0.7479" /> - <stop - id="stop108" - style="stop-color:#BBBBBB" - offset="0.8462" /> - <stop - id="stop110" - style="stop-color:#C5C5C5" - offset="0.8763" /> - <stop - id="stop112" - style="stop-color:#D7D7D7" - offset="0.9482" /> - <stop - id="stop114" - style="stop-color:#DDDDDD" - offset="1" /> - </linearGradient> - <radialGradient - gradientUnits="userSpaceOnUse" - r="137.8933" - cy="111.1299" - cx="101.1562" - id="XMLID_7_"> - <stop - id="stop22" - style="stop-color:#555555" - offset="0.1006" /> - <stop - id="stop24" - style="stop-color:#676767" - offset="0.115" /> - <stop - id="stop26" - style="stop-color:#9B9B9B" - offset="0.1614" /> - <stop - id="stop28" - style="stop-color:#C0C0C0" - offset="0.2018" /> - <stop - id="stop30" - style="stop-color:#D8D8D8" - offset="0.2341" /> - <stop - id="stop32" - style="stop-color:#E0E0E0" - offset="0.2544" /> - <stop - id="stop34" - style="stop-color:#EDEDED" - offset="0.3115" /> - <stop - id="stop36" - style="stop-color:#FAFAFA" - offset="0.4005" /> - <stop - id="stop38" - style="stop-color:#FFFFFF" - offset="0.4793" /> - <stop - id="stop40" - style="stop-color:#FAFAFA" - offset="0.5997" /> - <stop - id="stop42" - style="stop-color:#EEEEEE" - offset="0.7219" /> - <stop - id="stop44" - style="stop-color:#DDDDDD" - offset="0.8876" /> - </radialGradient> - <foreignObject - requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/" - x="0" - y="0" - width="1" - height="1" - id="foreignObject7"> - <i:pgfRef - xlink:href="#adobe_illustrator_pgf" /> - </foreignObject> - <linearGradient - id="linearGradient3044"> - <stop - id="stop3046" - offset="0" - style="stop-color:black;stop-opacity:1;" /> - <stop - id="stop3048" - offset="1" - style="stop-color:#5f5f5f;stop-opacity:1;" /> - </linearGradient> - <linearGradient - id="linearGradient3061" - inkscape:collect="always"> - <stop - id="stop3063" - offset="0" - style="stop-color:white;stop-opacity:1;" /> - <stop - id="stop3065" - offset="1" - style="stop-color:white;stop-opacity:0;" /> - </linearGradient> - <inkscape:perspective - id="perspective9450" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_9_" - id="radialGradient10528" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" - cx="113.0986" - cy="114" - r="165.9343" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_10_" - id="radialGradient10530" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.49967,0,0,1.49967,-43.15375,-35.54269)" - cx="110.4854" - cy="114" - r="165.9342" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10532" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="linearGradient10536" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(147.99999,239.1304)" - x1="79.75" - y1="84" - x2="120.25" - y2="84" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10539" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.30236,239.1304)" - x1="26.697636" - y1="96" - x2="14.697635" - y2="72" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10542" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.30236,239.1304)" - x1="6.6976352" - y1="52" - x2="11.68106" - y2="96.001434" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient10545" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.3125,239.1304)" - x1="11.68106" - y1="60.539303" - x2="11.68106" - y2="108.0104" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient10548" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - cx="-44" - cy="84" - fx="-40" - fy="96" - r="20" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3030" - id="radialGradient10552" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - cx="-44" - cy="84" - fx="-60" - fy="100" - r="24" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient10561" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - x1="-13.757333" - y1="76.708466" - x2="-62.424866" - y2="104.80668" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5412" - id="linearGradient10567" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="linearGradient10569" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.039383,0.9621093)" - x1="64.341991" - y1="18.50366" - x2="76.284438" - y2="18.50366" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient10588" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - x1="-13.757333" - y1="76.708466" - x2="-62.424866" - y2="104.80668" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10590" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10592" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5412" - id="linearGradient10594" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3207" - id="linearGradient10596" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.039383,0.9621093)" - x1="64.341991" - y1="18.50366" - x2="76.284438" - y2="18.50366" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10598" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3030" - id="radialGradient10600" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - cx="-44" - cy="84" - fx="-60" - fy="100" - r="24" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10602" - gradientUnits="userSpaceOnUse" - spreadMethod="reflect" - x1="73.742638" - y1="15.336544" - x2="80" - y2="19.281664" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="radialGradient10604" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(292,239.1304)" - cx="-44" - cy="84" - fx="-40" - fy="96" - r="20" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3272" - id="linearGradient10606" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.3125,239.1304)" - x1="11.68106" - y1="60.539303" - x2="11.68106" - y2="108.0104" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10608" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.30236,239.1304)" - x1="6.6976352" - y1="52" - x2="11.68106" - y2="96.001434" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3260" - id="linearGradient10610" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(229.30236,239.1304)" - x1="26.697636" - y1="96" - x2="14.697635" - y2="72" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3225" - id="linearGradient10612" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(147.99999,239.1304)" - x1="79.75" - y1="84" - x2="120.25" - y2="84" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3291" - id="linearGradient10614" - gradientUnits="userSpaceOnUse" - x1="64" - y1="83.729706" - x2="64" - y2="-62.169582" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3186" - id="linearGradient10616" - gradientUnits="userSpaceOnUse" - x1="64" - y1="24" - x2="64" - y2="-52" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3283" - id="radialGradient10618" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(23,-10e-7,6.1024648e-7,14.035669,-1452,156.4281)" - spreadMethod="reflect" - cx="66" - cy="-10.851176" - fx="66" - fy="-10.851176" - r="2" /> + x1="386.89221" + y1="703.53375" + x2="386.89221" + y2="252.50571" /> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="84.275956" - inkscape:cy="35.648755" + inkscape:zoom="1.0508882" + inkscape:cx="-90.42008" + inkscape:cy="71.977333" inkscape:document-units="px" - inkscape:current-layer="g10573" + inkscape:current-layer="layer1" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1280" + inkscape:window-height="979" + inkscape:window-x="0" + inkscape:window-y="33" showgrid="false" - inkscape:snap-bbox="true" - inkscape:window-width="1680" - inkscape:window-height="997" - inkscape:window-x="-4" - inkscape:window-y="30" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid2383" - visible="true" - enabled="true" - spacingx="4px" - spacingy="4px" - empspacing="2" /> + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="vertical" + position="-153.50258,-506.94648" + id="guide3191" /> + <sodipodi:guide + orientation="vertical" + position="274.4401,-506.94648" + id="guide3193" /> + <sodipodi:guide + orientation="horizontal" + position="-323.06477,409.4968" + id="guide3195" /> + <sodipodi:guide + orientation="horizontal" + position="-323.06477,211.67424" + id="guide3197" /> + <sodipodi:guide + orientation="horizontal" + position="-323.06477,9.814489" + id="guide3199" /> </sodipodi:namedview> <metadata id="metadata7"> @@ -7138,120 +135,166 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> <g - inkscape:label="Layer 1" + inkscape:label="Ebene 1" inkscape:groupmode="layer" - id="layer1"> + id="layer1" + transform="translate(-323.06477,-417.41394)"> <g - id="g3346" - transform="matrix(-0.7071068,-0.7071067,-0.7071067,0.7071068,157.92387,65.414211)" - mask="url(#mask3495)"> + id="g3015" + transform="matrix(0.20679483,0,0,0.21391708,307.0229,378.43143)"> <g - id="g3281"> - <rect - style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient3357);stroke-width:11.22497177;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3238)" - id="rect3224" - width="28" - height="84" - x="50" - y="22" - rx="14" - ry="14" - transform="matrix(1.1428572,0,0,1,-7.1428595,0)" /> - <rect - style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient3359);stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2433" - width="32" - height="84" - x="50.000004" - y="22" - rx="16" - ry="16" /> - <rect - ry="16" - rx="16" - y="22" - x="50.000004" - height="84" - width="32" - id="rect3218" - style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient3361);stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + transform="translate(3.581054,-461.3231)" + id="g5213"> + <path + sodipodi:type="arc" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path4201" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + transform="translate(41.899029,623.49247)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path4203" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + transform="translate(41.899029,821.58422)" /> + <path + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + sodipodi:ry="82.08963" + sodipodi:rx="82.08963" + sodipodi:cy="125.15305" + sodipodi:cx="129.19025" + id="path4205" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" + transform="translate(41.899029,1019.6759)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path4209" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + transform="translate(466.69074,623.49247)" /> + <path + sodipodi:type="arc" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path4211" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + transform="translate(466.69074,821.58422)" /> + <path + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + sodipodi:ry="82.08963" + sodipodi:rx="82.08963" + sodipodi:cy="125.15305" + sodipodi:cx="129.19025" + id="path4213" + style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" + transform="translate(466.69074,1019.6759)" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:50;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 168.66696,746.8288 152.06768,0 2.85473,123.09483 c 56.19521,-0.39952 52.33668,51.2956 53.28826,76.46761 1.35196,23.3996 12.75809,72.52216 -57.09457,73.61286 l 0.95158,127.8527 277.22073,0" + id="path4215" + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:50;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 168.66696,945.99709 278.56646,0 0,-199.65012 151.75839,0" + id="path4217" + inkscape:connector-curvature="0" /> </g> <g - transform="translate(0,4)" - id="g3276"> - <rect - style="opacity:0.6;fill:none;fill-opacity:1;stroke:url(#linearGradient10614);stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3272)" - id="rect3256" - width="4" - height="88" - x="64" - y="-56" - rx="2" - ry="2" /> - <rect - style="opacity:1;fill:url(#linearGradient10616);fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3246" - width="4" - height="88" - x="64" - y="-56" - rx="2" - ry="2" /> - <rect - ry="2" - rx="2" - y="-56" - x="64" - height="88" - width="4" - id="rect3250" - style="opacity:1;fill:url(#radialGradient10618);fill-opacity:1;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="g3012"> + <path + sodipodi:type="arc" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path2160" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + transform="translate(45.480079,154.16937)" /> </g> - <use - height="128" - width="128" - transform="translate(0,144)" - id="use3296" - xlink:href="#g3276" - y="0" - x="0" /> - </g> - <g - id="g10573" - transform="translate(-144,-219.13041)"> <path - sodipodi:nodetypes="cccccc" - transform="matrix(-0.5,0,0,0.5,280,293.48957)" - id="path3091" - d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" - style="fill:url(#linearGradient10590);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" - clip-path="none" /> + transform="translate(45.480079,352.26112)" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + sodipodi:ry="82.08963" + sodipodi:rx="82.08963" + sodipodi:cy="125.15305" + sodipodi:cx="129.19025" + id="path3140" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" /> <path - style="fill:url(#linearGradient10592);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" - d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.172686,21.789699 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" - id="path3095" - transform="matrix(0.5,0,0,0.5,216.35562,293.48957)" - sodipodi:nodetypes="cccccc" - clip-path="none" /> + transform="translate(45.480079,550.35281)" + sodipodi:type="arc" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path3142" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" /> <path - sodipodi:nodetypes="cccccc" - transform="matrix(0.5,0,0,0.5,232.35562,309.10161)" - id="path3221" - d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" - style="opacity:0.55056176;fill:url(#linearGradient10598);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" - clip-path="none" /> + transform="translate(470.27179,154.16937)" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + sodipodi:ry="82.08963" + sodipodi:rx="82.08963" + sodipodi:cy="125.15305" + sodipodi:cx="129.19025" + id="path3151" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" /> <path - style="opacity:0.55056176;fill:url(#linearGradient10602);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3387)" - d="M 69.875971,12.057888 C 68.798883,12.123171 67.34775,12.277052 66.875971,12.995388 L 68.465655,24.133449 L 79,23.37409 L 79,22.90534 C 80.740958,20.33518 74.219552,11.998548 69.875971,12.057888 z" - id="path3217" - transform="matrix(-0.5,0,0,0.5,263.64437,309.10161)" - sodipodi:nodetypes="cccccc" - clip-path="none" /> + transform="translate(470.27179,352.26112)" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" + sodipodi:ry="82.08963" + sodipodi:rx="82.08963" + sodipodi:cy="125.15305" + sodipodi:cx="129.19025" + id="path3153" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" /> + <path + transform="translate(470.27179,550.35281)" + sodipodi:type="arc" + style="fill:none;stroke:#3a78be;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="path3155" + sodipodi:cx="129.19025" + sodipodi:cy="125.15305" + sodipodi:rx="82.08963" + sodipodi:ry="82.08963" + d="m 211.27988,125.15305 c 0,45.33685 -36.75278,82.08963 -82.08963,82.08963 -45.336854,0 -82.089634,-36.75278 -82.089634,-82.08963 0,-45.336848 36.75278,-82.089627 82.089634,-82.089627 45.33685,0 82.08963,36.752779 82.08963,82.089627 z" /> + <path + id="path3203" + d="m 172.24801,476.67399 278.56646,0 0,-199.65012 151.75839,0" + style="fill:none;stroke:url(#linearGradient3035);stroke-width:50;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + <path + sodipodi:nodetypes="ccccccc" + id="path3201" + d="m 172.24801,277.5057 152.06768,0 2.85473,123.09483 c 45.72787,0.55206 48.53038,48.44087 53.28826,76.46761 -1.50277,23.3996 -4.37028,72.52219 -57.09457,73.61289 l 0.95158,127.85271 277.22073,0" + style="fill:none;stroke:url(#linearGradient3037);stroke-width:50;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> </g> </g> </svg> diff --git a/resources/images/plugboard.png b/resources/images/plugboard.png index 345fa6440e612468ad76b3e3fa5bf07c89f18250..db9e8e89f051e5513ef3a370db358be2280b0cc2 100644 GIT binary patch literal 13054 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 literal 3694 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 diff --git a/src/calibre/gui2/metadata.py b/src/calibre/gui2/metadata.py index c71f82c654..a36571fc91 100644 --- a/src/calibre/gui2/metadata.py +++ b/src/calibre/gui2/metadata.py @@ -19,6 +19,7 @@ from calibre import prints from calibre.constants import DEBUG class Worker(Thread): + 'Cover downloader' def __init__(self): Thread.__init__(self) @@ -88,7 +89,7 @@ class DownloadMetadata(Thread): if mi.isbn: args['isbn'] = mi.isbn else: - if not mi.title or mi.title == _('Unknown'): + if mi.is_null('title'): self.failures[id] = \ (str(id), _('Book has neither title nor ISBN')) continue From e199c00cc9f67040231ae31f694abb89e3780118 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 18:08:05 -0600 Subject: [PATCH 202/235] Initialize dirtied_cache correctly --- src/calibre/library/database2.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index ca8824ae1c..9d9ebf64c5 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -348,10 +348,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): setattr(self, 'title_sort', functools.partial(self.get_property, loc=self.FIELD_MAP['sort'])) - self.dirtied_cache = set() d = self.conn.get('SELECT book FROM metadata_dirtied', all=True) for x in d: self.dirtied_queue.put(x[0]) + self.dirtied_cache = set([x[0] for x in d]) self.refresh_ondevice = functools.partial(self.data.refresh_ondevice, self) self.refresh() @@ -616,9 +616,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.conn.commit() def dirtied(self, book_ids, commit=True): - for book in book_ids: - if book in self.dirtied_cache: - continue + for book in frozenset(book_ids) - self.dirtied_cache: try: self.conn.execute( 'INSERT INTO metadata_dirtied (book) VALUES (?)', From 6608dc2cd4b89b19cd922eae7c293d8a6dae7afd Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 18:16:18 -0600 Subject: [PATCH 203/235] Metadata backup: Try to ensure that a dirtied book is not ignored during shutdown --- src/calibre/gui2/ui.py | 3 +++ src/calibre/library/caches.py | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index cc2975e7a7..4667431d96 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -579,6 +579,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ except KeyboardInterrupt: pass time.sleep(2) + if mb is not None: + mb.flush() + QApplication.processEvents() self.hide_windows() return True diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 0c3904532e..e18f514239 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -40,12 +40,14 @@ class MetadataBackup(Thread): # {{{ self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump) self.clear_dirtied = FunctionDispatcher(db.clear_dirtied) self.set_dirtied = FunctionDispatcher(db.dirtied) + self.in_limbo = None def stop(self): self.keep_running = False def run(self): while self.keep_running: + self.in_limbo = None try: time.sleep(0.5) # Limit to two per second id_ = self.db.dirtied_queue.get(True, 1.45) @@ -72,6 +74,7 @@ class MetadataBackup(Thread): # {{{ if mi is None: continue + self.in_limbo = id_ # Give the GUI thread a chance to do something. Python threads don't # have priorities, so this thread would naturally keep the processor @@ -99,6 +102,14 @@ class MetadataBackup(Thread): # {{{ 'again, giving up') continue + def flush(self): + 'Used during shutdown to ensure that a dirtied book is not missed' + if self.in_limbo is not None: + try: + self.set_dirtied([self.in_limbo]) + except: + traceback.print_exc() + def write(self, path, raw): with open(path, 'wb') as f: f.write(raw) From 93d92ee2505d8c8386ddd701484628398995c576 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 18:32:26 -0600 Subject: [PATCH 204/235] LibraryThing plugin: Handle non ascii chars correctly --- src/calibre/ebooks/metadata/library_thing.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/ebooks/metadata/library_thing.py b/src/calibre/ebooks/metadata/library_thing.py index 669d9478a3..7f312da1d9 100644 --- a/src/calibre/ebooks/metadata/library_thing.py +++ b/src/calibre/ebooks/metadata/library_thing.py @@ -12,6 +12,7 @@ import mechanize from calibre import browser, prints from calibre.utils.config import OptionParser from calibre.ebooks.BeautifulSoup import BeautifulSoup +from calibre.ebooks.chardet import strip_encoding_declarations OPENLIBRARY = 'http://covers.openlibrary.org/b/isbn/%s-L.jpg?default=false' @@ -110,6 +111,8 @@ def get_social_metadata(title, authors, publisher, isbn, username=None, +isbn).read() if not raw: return mi + raw = raw.decode('utf-8', 'replace') + raw = strip_encoding_declarations(raw) root = html.fromstring(raw) h1 = root.xpath('//div[@class="headsummary"]/h1') if h1 and not mi.title: From 05cf311555df62c4a2191617e0bc6e0e42e5373d Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 18:48:17 -0600 Subject: [PATCH 205/235] Cleanup ISBNdb metadata plugin --- src/calibre/ebooks/metadata/isbndb.py | 38 ++++++++++++++++++--------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/metadata/isbndb.py b/src/calibre/ebooks/metadata/isbndb.py index 6c321bf9d3..6416dcdc39 100644 --- a/src/calibre/ebooks/metadata/isbndb.py +++ b/src/calibre/ebooks/metadata/isbndb.py @@ -47,29 +47,43 @@ class ISBNDBMetadata(Metadata): def __init__(self, book): Metadata.__init__(self, None, []) + def tostring(e): + if not hasattr(e, 'string'): + return None + ans = e.string + if ans is not None: + ans = unicode(ans).strip() + if not ans: + ans = None + return ans + self.isbn = unicode(book.get('isbn13', book.get('isbn'))) - self.title = unicode(book.find('titlelong').string) + self.title = tostring(book.find('titlelong')) if not self.title: - self.title = unicode(book.find('title').string) + self.title = tostring(book.find('title')) + if not self.title: + self.title = _('Unknown') self.title = unicode(self.title).strip() - au = unicode(book.find('authorstext').string).strip() - temp = au.split(',') self.authors = [] - for au in temp: - if not au: continue - self.authors.extend([a.strip() for a in au.split('&')]) + au = tostring(book.find('authorstext')) + if au: + au = au.strip() + temp = au.split(',') + for au in temp: + if not au: continue + self.authors.extend([a.strip() for a in au.split('&')]) try: - self.author_sort = book.find('authors').find('person').string + self.author_sort = tostring(book.find('authors').find('person')) if self.authors and self.author_sort == self.authors[0]: self.author_sort = None except: pass - self.publisher = unicode(book.find('publishertext').string) + self.publisher = tostring(book.find('publishertext')) - summ = book.find('summary') - if summ and hasattr(summ, 'string') and summ.string: - self.comments = 'SUMMARY:\n'+unicode(summ.string) + summ = tostring(book.find('summary')) + if summ: + self.comments = 'SUMMARY:\n'+summ.string def build_isbn(base_url, opts): From 1874dfbd968d5d0e3ddd1f86497dbc5223715c99 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 20:16:20 -0600 Subject: [PATCH 206/235] Seventh beta --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 7cb4d78cf8..7c16b9020c 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.7.905' +__version__ = '0.7.906' __author__ = "Kovid Goyal <kovid@kovidgoyal.net>" import re From 56fce8862f220dac65e06620fb5b2f618cd65256 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 20:54:24 -0600 Subject: [PATCH 207/235] ... --- src/calibre/library/caches.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index e18f514239..179262dedc 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -101,12 +101,13 @@ class MetadataBackup(Thread): # {{{ prints('Failed to write backup metadata for id:', id_, 'again, giving up') continue + self.in_limbo = None def flush(self): 'Used during shutdown to ensure that a dirtied book is not missed' if self.in_limbo is not None: try: - self.set_dirtied([self.in_limbo]) + self.db.dirtied([self.in_limbo]) except: traceback.print_exc() From 01d7397cca012326789ffcc8b02a095ef3bc579a Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Wed, 29 Sep 2010 20:59:00 -0600 Subject: [PATCH 208/235] ... --- src/calibre/gui2/ui.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 4667431d96..937b23b113 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -581,7 +581,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ time.sleep(2) if mb is not None: mb.flush() - QApplication.processEvents() self.hide_windows() return True From bb97bd6cabe025c7ba0cd8d6feb19e926e33412d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 30 Sep 2010 09:45:18 +0100 Subject: [PATCH 209/235] 1) fix problem in rtf metadata writer -- categories isn't a standard option. 2) fix book/base.py to always return a default. That is what python is supposed to do. 3) add ability to code 'key in mi' (the __iter__ function) (base.py) 4) add has_key() to base.py 5) have rename refuse to allow & characters in author names --- src/calibre/ebooks/metadata/book/base.py | 16 ++++++++++------ src/calibre/ebooks/metadata/rtf.py | 4 ++-- src/calibre/gui2/dialogs/edit_authors_dialog.py | 7 +++++++ src/calibre/gui2/tag_view.py | 7 ++++++- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index be597b2327..82da530535 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -133,6 +133,12 @@ class Metadata(object): # Don't abuse this privilege self.__dict__[field] = val + def __iter__(self): + return object.__getattribute__(self, '_data').iterkeys() + + def has_key(self, key): + return key in object.__getattribute__(self, '_data') + def deepcopy(self): m = Metadata(None) m.__dict__ = copy.deepcopy(self.__dict__) @@ -140,12 +146,10 @@ class Metadata(object): return m def get(self, field, default=None): - if default is not None: - try: - return self.__getattribute__(field) - except AttributeError: - return default - return self.__getattribute__(field) + try: + return self.__getattribute__(field) + except AttributeError: + return default def get_extra(self, field): _data = object.__getattribute__(self, '_data') diff --git a/src/calibre/ebooks/metadata/rtf.py b/src/calibre/ebooks/metadata/rtf.py index d116ec30fb..ad41125575 100644 --- a/src/calibre/ebooks/metadata/rtf.py +++ b/src/calibre/ebooks/metadata/rtf.py @@ -125,7 +125,7 @@ def create_metadata(stream, options): au = u', '.join(au) author = au.encode('ascii', 'ignore') md += r'{\author %s}'%(author,) - if options.category: + if options.get('category', None): category = options.category.encode('ascii', 'ignore') md += r'{\category %s}'%(category,) comp = options.comment if hasattr(options, 'comment') else options.comments @@ -180,7 +180,7 @@ def set_metadata(stream, options): src = pat.sub(r'{\\author ' + author + r'}', src) else: src = add_metadata_item(src, 'author', author) - category = options.category + category = options.get('category', None) if category != None: category = category.encode('ascii', 'replace') pat = re.compile(base_pat.replace('name', 'category'), re.DOTALL) diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.py b/src/calibre/gui2/dialogs/edit_authors_dialog.py index 7fe50181a3..2fdb8e28cc 100644 --- a/src/calibre/gui2/dialogs/edit_authors_dialog.py +++ b/src/calibre/gui2/dialogs/edit_authors_dialog.py @@ -6,6 +6,7 @@ __license__ = 'GPL v3' from PyQt4.Qt import Qt, QDialog, QTableWidgetItem, QAbstractItemView from calibre.ebooks.metadata import author_to_author_sort +from calibre.gui2 import error_dialog from calibre.gui2.dialogs.edit_authors_dialog_ui import Ui_EditAuthorsDialog class tableItem(QTableWidgetItem): @@ -109,6 +110,12 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog): if col == 0: item = self.table.item(row, 0) aut = unicode(item.text()).strip() + amper = aut.find('&') + if amper >= 0: + error_dialog(self.parent(), _('Invalid author name'), + _('Author names cannot contain & characters.')).exec_() + aut = aut.replace('&', '%') + self.table.item(row, 0).setText(aut) c = self.table.item(row, 1) c.setText(author_to_author_sort(aut)) item = c diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py index 6c50a71b92..68b7645d36 100644 --- a/src/calibre/gui2/tag_view.py +++ b/src/calibre/gui2/tag_view.py @@ -505,7 +505,12 @@ class TagsModel(QAbstractItemModel): # {{{ key = item.parent.category_key # make certain we know about the item's category if key not in self.db.field_metadata: - return + return False + if key == 'authors': + if val.find('&') >= 0: + error_dialog(self.tags_view, _('Invalid author name'), + _('Author names cannot contain & characters.')).exec_() + return False if key == 'search': if val in saved_searches().names(): error_dialog(self.tags_view, _('Duplicate search name'), From a8630df0f7d591c97a61549ab95282e8e1e6ff7b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 30 Sep 2010 10:37:16 +0100 Subject: [PATCH 210/235] Slight improvements on control enabling and sequencing in GUI --- src/calibre/gui2/preferences/plugboard.py | 32 ++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index 97af1563e2..f890a5560c 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -78,6 +78,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.ok_button.clicked.connect(self.ok_clicked) self.del_button.clicked.connect(self.del_clicked) + self.refilling = False self.refill_all_boxes() def clear_fields(self, edit_boxes=False, new_boxes=False): @@ -108,8 +109,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.dest_widgets[i].setCurrentIndex(idx) def edit_device_changed(self, txt): + self.current_device = None if txt == '': - self.current_device = None + self.clear_fields(new_boxes=False) return self.clear_fields(new_boxes=True) self.current_device = unicode(txt) @@ -128,10 +130,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.del_button.setEnabled(True) def edit_format_changed(self, txt): + self.edit_device.setCurrentIndex(0) + self.current_device = None + self.current_format = None if txt == '': - self.edit_device.setCurrentIndex(0) - self.current_format = None - self.current_device = None + self.clear_fields(new_boxes=False) return self.clear_fields(new_boxes=True) txt = unicode(txt) @@ -145,11 +148,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): devices.append(d) self.edit_device.clear() self.edit_device.addItems(devices) - self.edit_device.setCurrentIndex(0) def new_device_changed(self, txt): + self.current_device = None if txt == '': - self.current_device = None + self.clear_fields(edit_boxes=False) return self.clear_fields(edit_boxes=True) self.current_device = unicode(txt) @@ -200,13 +203,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.set_fields() def new_format_changed(self, txt): - if txt == '': - self.current_format = None - self.current_device = None - return - self.clear_fields(edit_boxes=True) - self.current_format = unicode(txt) + self.current_format = None + self.current_device = None self.new_device.setCurrentIndex(0) + if txt: + self.clear_fields(edit_boxes=True) + self.current_format = unicode(txt) + else: + self.clear_fields(edit_boxes=False) def ok_clicked(self): pb = [] @@ -254,6 +258,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.refill_all_boxes() def refill_all_boxes(self): + if self.refilling: + return + self.refilling = True self.current_device = None self.current_format = None self.clear_fields(new_boxes=True) @@ -277,6 +284,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): ops.append('[' + op[0] + '] -> ' + op[1]) txt += '%s:%s %s\n'%(f, d, ', '.join(ops)) self.existing_plugboards.setPlainText(txt) + self.refilling = False def restore_defaults(self): ConfigWidgetBase.restore_defaults(self) From dfd5048322de05d6346781d0cf71c33a4f05cfc2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 30 Sep 2010 12:14:20 +0100 Subject: [PATCH 211/235] 1) change the author sep character in plugboards to '&', because the '|' conflicts with template fields 2) permit both functions and format strings 3) Updates to the FAQ --- src/calibre/ebooks/metadata/book/base.py | 2 +- src/calibre/manual/template_lang.rst | 52 ++++++++++++++++++++++-- src/calibre/utils/formatter.py | 33 +++++++++------ 3 files changed, 70 insertions(+), 17 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/base.py b/src/calibre/ebooks/metadata/book/base.py index 82da530535..17611875f8 100644 --- a/src/calibre/ebooks/metadata/book/base.py +++ b/src/calibre/ebooks/metadata/book/base.py @@ -316,7 +316,7 @@ class Metadata(object): if dest == 'tags': self.set(dest, [f.strip() for f in val.split(',') if f.strip()]) elif dest == 'authors': - self.set(dest, [f.strip() for f in val.split('|') if f.strip()]) + self.set(dest, [f.strip() for f in val.split('&') if f.strip()]) else: self.set(dest, val) except: diff --git a/src/calibre/manual/template_lang.rst b/src/calibre/manual/template_lang.rst index 1ab004f3f3..8cdf114b40 100644 --- a/src/calibre/manual/template_lang.rst +++ b/src/calibre/manual/template_lang.rst @@ -9,7 +9,7 @@ The |app| template language The |app| template language is used in various places. It is used to control the folder structure and file name when saving files from the |app| library to the disk or eBook reader. It is also used to define "virtual" columns that contain data from other columns and so on. -The basic template language is very simple, but has very powerful advanced features. The basic idea is that a template consists of names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: +The basic template language is very simple, but has very powerful advanced features. The basic idea is that a template consists of text and names in curly brackets that are then replaced by the corresponding metadata from the book being processed. So, for example, the default template used for saving books to device in |app| is:: {author_sort}/{title}/{title} - {authors} @@ -17,6 +17,14 @@ For the book "The Foundation" by "Isaac Asimov" it will become:: Asimov, Isaac/The Foundation/The Foundation - Isaac Asimov +The slashes are text, which is put into the template where it appears. For example, if your template is:: + + {author_sort} Some Important Text {title}/{title} - {authors} + +For the book "The Foundation" by "Isaac Asimov" it will become:: + + Asimov, Isaac Some Important Text The Foundation/The Foundation - Isaac Asimov + You can use all the various metadata fields available in calibre in a template, including any custom columns you have created yourself. To find out the template name for a column simply hover your mouse over the column header. Names for custom fields (columns you have created yourself) always have a # as the first character. For series type custom fields, there is always an additional field named ``#seriesname_index`` that becomes the series index for that series. So if you have a custom series field named ``#myseries``, there will also be a field named ``#myseries_index``. In addition to the column based fields, you also can use:: @@ -96,7 +104,9 @@ Using functions in templates Suppose you want to display the value of a field in upper case, when that field is normally in title case. You can do this (and many more things) using the functions available for templates. For example, to display the title in upper case, use ``{title:uppercase()}``. To display it in title case, use ``{title:titlecase()}``. -Function references replace the formatting specification, going after the : and before the first ``|`` or the closing ``}``. Functions must always end with ``()``. Some functions take extra values (arguments), and these go inside the ``()``. +Function references appear in the format part, going after the ``:`` and before the first ``|`` or the closing ``}``. If you have both a format and a function reference, the function comes after another ``:``. Functions must always end with ``()``. Some functions take extra values (arguments), and these go inside the ``()``. + +Functions are always applied before format specifications. See further down for an example of using both a format and a function, where this order is demonstrated. The syntax for using functions is ``{field:function(arguments)}``, or ``{field:function(arguments)|prefix|suffix}``. Argument values cannot contain a comma, because it is used to separate arguments. The last (or only) argument cannot contain a closing parenthesis ( ')' ). Functions return the value of the field used in the template, suitably modified. @@ -113,6 +123,16 @@ The functions available are: * ``lookup(field if not empty, field if empty)`` -- like test, 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 (more later). * ``re(pattern, replacement)`` -- return the field after applying the regular expression. All instances of `pattern` are replaced with `replacement`. As in all of |app|, these are python-compatible regular expressions. +Now, about using functions and formatting in the same field. Suppose you have an integer custom column called ``#myint`` that you want to see with leading zeros, as in ``003``. To do this, you would use a format of ``0>3s``. However, by default, if a number (integer or float) equals zero then the field produces the empty value, so zero values will produce nothing, not ``000``. If you really want to see ``000`` values, then you use both the format string and the ``ifempty`` function to change the empty value back to a zero. The field reference would be:: + + {#myint:0>3s:ifempty(0)} + +Note that you can use the prefix and suffix as well. If you want the number to appear as ``[003]`` or ``[000]``, then use the field:: + + {#myint:0>3s:ifempty(0)|[|]} + + + Special notes for save/send templates ------------------------------------- @@ -124,11 +144,35 @@ For example, assume we want the folder structure `series/series_index - title`, The slash and the hyphen appear only if series is not empty. -The lookup function lets us do even fancier processing. For example, assume we want the following: if a book has a series, then we want the folder structure `series/series index - title.fmt`. If the book does not have a series, then we want the folder structure `genre/author_sort/title.fmt`. If the book has no genre, use 'Unknown'. We want two completely different paths, depending on the value of series. +The lookup function lets us do even fancier processing. For example, assume that if a book has a series, then we want the folder structure `series/series index - title.fmt`. If the book does not have a series, then we want the folder structure `genre/author_sort/title.fmt`. If the book has no genre, we want to use 'Unknown'. We want two completely different paths, depending on the value of series. To accomplish this, we: - 1. Create a composite field (call it AA) containing ``{series:||}/{series_index} - {title'}``. If the series is not empty, then this template will produce `series/series_index - title`. + 1. Create a composite field (call it AA) containing ``{series}/{series_index} - {title'}``. If the series is not empty, then this template will produce `series/series_index - title`. 2. Create a composite field (call it BB) containing ``{#genre:ifempty(Unknown)}/{author_sort}/{title}``. This template produces `genre/author_sort/title`, where an empty genre is replaced wuth `Unknown`. 3. Set the save template to ``{series:lookup(AA,BB)}``. This template chooses composite field AA if series is not empty, and composite field BB if series is empty. We therefore have two completely different save paths, depending on whether or not `series` is empty. +Templates and Plugboards +------------------------ +Plugboards are used for changing the metadata written into books during send-to-device and save-to-disk operations. A plugboard permits you to specify a template to provide the data to write into the book's metadata. You can use plugboards to modify the following fields: authors, author_sort, language, publisher, tags, title, title_sort. This feature should help those of you who want to use different metadata in your books on devices to solve sorting or display issues. + +When you create a plugboard, you specify the format and device for which the plugboard is to be used. A special device is provided, save_to_disk, that is used when saving formats (as opposed to sending them to a device). Once you have chosen the format and device, you choose the metadata fields to change, providing templates to supply the new values. These templates are `connected` to their destination fields, hence the name `plugboards`. You can, of course, use composite columns in these templates. + +The tags and authors fields have special treatment, because both of these fields can hold more than one item. After all, book can have many tags and many authors. When you specify that one of these two fields is to be changed, the result of evaluating the template is examined to see if more than one item is there. + +For tags, the result cut apart whereever |app| finds a comma. For example, if the template produces the value ``Thriller, Horror``, then the result will be two tags, ``Thriller`` and ``Horror``. There is no way to put a comma in the middle of a tag. + +The same thing happens for authors, but using a different character for the cut, a `&` (ampersand) instead of a comma. For example, if the template produces the value ``Blogs, Joe&Posts, Susan``, then the book will end up with two authors, ``Blogs, Joe`` and ``Posts, Susan``. If the template produces the value ``Blogs, Joe;Posts, Susan``, then the book will have one author with a rather strange name. + +Plugboards affect only the metadata written into the book. They do not affect calibre's metadata or the metadata used in ``save to disk`` and ``send to device`` templates. Plugboards also do not affect what is written into a Sony's database, so cannot be used for altering the metadata shown on a Sony's menu. + +Helpful Tips +------------ + +You might find the following tips useful. + + * Create a custom composite column to test templates. Once you have the column, you can change its template simply by double-clicking on the column. Hide the column when you are not testing. + * Templates can use other templates by referencing a composite custom column. + * In a plugboard, you can set a field to empty (or whatever is equivalent to empty) by using the special template ``{null}``. This template will always evaluate to an empty string. + * The technique described above to show numbers even if they have a zero value works with the standard field series_index. + \ No newline at end of file diff --git a/src/calibre/utils/formatter.py b/src/calibre/utils/formatter.py index 502574dd3c..043d55b34f 100644 --- a/src/calibre/utils/formatter.py +++ b/src/calibre/utils/formatter.py @@ -93,19 +93,28 @@ class TemplateFormatter(string.Formatter): # Handle functions p = fmt.find('(') - if p >= 0 and fmt[-1] == ')' and fmt[0:p] in self.functions: - field = fmt[0:p] - func = self.functions[field] - args = fmt[p+1:-1].split(',') - if (func[0] == 0 and (len(args) != 1 or args[0])) or \ - (func[0] > 0 and func[0] != len(args)): - raise ValueError('Incorrect number of arguments for function '+ fmt[0:p]) - if func[0] == 0: - val = func[1](self, val) + dispfmt = fmt + if p >= 0 and fmt[-1] == ')': + colon = fmt[0:p].find(':') + if colon < 0: + dispfmt = '' + colon = 0 else: - val = func[1](self, val, *args) - elif val: - val = string.Formatter.format_field(self, val, fmt) + dispfmt = fmt[0:colon] + colon += 1 + if fmt[colon:p] in self.functions: + field = fmt[colon:p] + func = self.functions[field] + args = fmt[p+1:-1].split(',') + if (func[0] == 0 and (len(args) != 1 or args[0])) or \ + (func[0] > 0 and func[0] != len(args)): + raise ValueError('Incorrect number of arguments for function '+ fmt[0:p]) + if func[0] == 0: + val = func[1](self, val) + else: + val = func[1](self, val, *args) + if val: + val = string.Formatter.format_field(self, val, dispfmt) if not val: return '' return prefix + val + suffix From 46fbd2586e4c4e0c95fbcd9ce6bacba5755ede0b Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 30 Sep 2010 12:59:41 +0100 Subject: [PATCH 212/235] Make the list of plugboards clickable by changing to a listwidget --- src/calibre/gui2/preferences/plugboard.py | 17 +++++++++++++---- src/calibre/gui2/preferences/plugboard.ui | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/calibre/gui2/preferences/plugboard.py b/src/calibre/gui2/preferences/plugboard.py index f890a5560c..59ef4cb246 100644 --- a/src/calibre/gui2/preferences/plugboard.py +++ b/src/calibre/gui2/preferences/plugboard.py @@ -6,6 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __docformat__ = 'restructuredtext en' from PyQt4 import QtGui +from PyQt4.Qt import Qt from calibre.gui2 import error_dialog from calibre.gui2.preferences import ConfigWidgetBase, test_widget @@ -75,6 +76,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.edit_format.currentIndexChanged[str].connect(self.edit_format_changed) self.new_device.currentIndexChanged[str].connect(self.new_device_changed) self.new_format.currentIndexChanged[str].connect(self.new_format_changed) + self.existing_plugboards.itemClicked.connect(self.existing_pb_clicked) self.ok_button.clicked.connect(self.ok_clicked) self.del_button.clicked.connect(self.del_clicked) @@ -257,6 +259,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.changed_signal.emit() self.refill_all_boxes() + def existing_pb_clicked(self, Qitem): + item = Qitem.data(Qt.UserRole).toPyObject() + self.edit_format.setCurrentIndex(self.edit_format.findText(item[0])) + self.edit_device.setCurrentIndex(self.edit_device.findText(item[1])) + def refill_all_boxes(self): if self.refilling: return @@ -272,7 +279,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.edit_device.clear() self.ok_button.setEnabled(False) self.del_button.setEnabled(False) - txt = '' + self.existing_plugboards.clear() for f in self.formats: if f not in self.current_plugboards: continue @@ -281,9 +288,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): continue ops = [] for op in self.current_plugboards[f][d]: - ops.append('[' + op[0] + '] -> ' + op[1]) - txt += '%s:%s %s\n'%(f, d, ', '.join(ops)) - self.existing_plugboards.setPlainText(txt) + ops.append('([' + op[0] + '] -> ' + op[1] + ')') + txt = '%s:%s = %s\n'%(f, d, ', '.join(ops)) + item = QtGui.QListWidgetItem(txt) + item.setData(Qt.UserRole, (f, d)) + self.existing_plugboards.addItem(item) self.refilling = False def restore_defaults(self): diff --git a/src/calibre/gui2/preferences/plugboard.ui b/src/calibre/gui2/preferences/plugboard.ui index f2ff6fb223..289518816f 100644 --- a/src/calibre/gui2/preferences/plugboard.ui +++ b/src/calibre/gui2/preferences/plugboard.ui @@ -99,12 +99,12 @@ One possible use for a plugboard is to alter the title to contain series informa </widget> </item> <item row="3" column="1" colspan="2"> - <widget class="QPlainTextEdit" name="existing_plugboards"> - <property name="lineWrapMode"> - <enum>QPlainTextEdit::NoWrap</enum> - </property> - <property name="readOnly"> - <bool>true</bool> + <widget class="QListWidget" name="existing_plugboards"> + <property name="sizeIncrement"> + <size> + <width>0</width> + <height>0</height> + </size> </property> </widget> </item> From e09c58357690aeaaab6aeeeb6fde389af9f7bdf1 Mon Sep 17 00:00:00 2001 From: GRiker <griker@hotmail.com> Date: Thu, 30 Sep 2010 05:04:57 -0700 Subject: [PATCH 213/235] GwR reversion to older INDX langauge encoding, added KG fix at #1572 for covers fixing ticket 6852 --- src/calibre/ebooks/mobi/writer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py index 51639ac757..404fdddff2 100644 --- a/src/calibre/ebooks/mobi/writer.py +++ b/src/calibre/ebooks/mobi/writer.py @@ -1,5 +1,6 @@ ''' Write content to Mobipocket books. +Foo ''' __license__ = 'GPL v3' From c04ea93c99bf144515022dfdc341f4e29d90cc04 Mon Sep 17 00:00:00 2001 From: GRiker <griker@hotmail.com> Date: Thu, 30 Sep 2010 05:05:09 -0700 Subject: [PATCH 214/235] GwR reversion to older INDX langauge encoding, added KG fix at #1572 for covers fixing ticket 6852 --- src/calibre/ebooks/mobi/writer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/ebooks/mobi/writer.py b/src/calibre/ebooks/mobi/writer.py index 404fdddff2..51639ac757 100644 --- a/src/calibre/ebooks/mobi/writer.py +++ b/src/calibre/ebooks/mobi/writer.py @@ -1,6 +1,5 @@ ''' Write content to Mobipocket books. -Foo ''' __license__ = 'GPL v3' From 75d55a38a081874c1864ce7413451bf3ba33661a Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 09:43:53 -0600 Subject: [PATCH 215/235] Oriental Daily by Larry Chan --- resources/recipes/oriental_daily.recipe | 50 +++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 resources/recipes/oriental_daily.recipe diff --git a/resources/recipes/oriental_daily.recipe b/resources/recipes/oriental_daily.recipe new file mode 100644 index 0000000000..e8048edcc5 --- /dev/null +++ b/resources/recipes/oriental_daily.recipe @@ -0,0 +1,50 @@ + +__license__ = 'GPL v3' +__copyright__ = '2010, Larry Chan <larry1chan at gmail.com>' +''' +oriental daily +''' +from calibre.web.feeds.recipes import BasicNewsRecipe + +class OrientalDaily(BasicNewsRecipe): + title = 'Oriental Dailly' + __author__ = 'Larry Chan' + description = 'News from HK' + oldest_article = 2 + max_articles_per_feed = 100 + simultaneous_downloads = 5 + no_stylesheets = True + #delay = 1 + use_embedded_content = False + encoding = 'utf8' + publisher = 'Oriental Daily' + category = 'news, HK, world' + language = 'zh' + publication_type = 'newsportal' + extra_css = ' body{ font-family: Verdana,Helvetica,Arial,sans-serif } .introduction{font-weight: bold} .story-feature{display: block; padding: 0; border: 1px solid; width: 40%; font-size: small} .story-feature h2{text-align: center; text-transform: uppercase} ' + + conversion_options = { + 'comments' : description + ,'tags' : category + ,'language' : language + ,'publisher' : publisher + ,'linearize_tables': True + } + + remove_tags_after = dict(id='bottomNavCTN') + + keep_only_tags = [ + dict(name='div', attrs={'id':['leadin', 'contentCTN-right']}) + + ] + + remove_tags = [ + dict(name='div', attrs={'class':['largeAdsCTN', 'contentCTN-left', 'textAdsCTN', 'footerAds clear']}), + dict(name='div', attrs={'id':['articleNav']}) + + ] + + remove_attributes = ['width','height','href'] + + + feeds = [(u'Oriental Daily', u'http://orientaldaily.on.cc/rss/news.xml')] From 2d5ed20856d8d4e088574c3803e48ef13ebdd8c5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 09:51:30 -0600 Subject: [PATCH 216/235] Various Belgian news sources by Lionel Bergeret --- resources/recipes/ajc.recipe | 1 + resources/recipes/china_economic_net.recipe | 2 +- resources/recipes/cinebel_be.recipe | 40 +++++++++++++++ resources/recipes/dhnet_be.recipe | 11 +++-- resources/recipes/journalgazette.recipe | 1 + resources/recipes/lalibre_be.recipe | 43 ++++++++++++++++ resources/recipes/lameuse_be.recipe | 54 +++++++++++++++++++++ resources/recipes/lavenir_be.recipe | 40 +++++++++++++++ resources/recipes/lesoir_be.recipe | 17 ++++--- resources/recipes/onionavclub.recipe | 1 + resources/recipes/technology_review.recipe | 1 + src/calibre/utils/localization.py | 1 + 12 files changed, 202 insertions(+), 10 deletions(-) create mode 100644 resources/recipes/cinebel_be.recipe create mode 100644 resources/recipes/lalibre_be.recipe create mode 100644 resources/recipes/lameuse_be.recipe create mode 100644 resources/recipes/lavenir_be.recipe diff --git a/resources/recipes/ajc.recipe b/resources/recipes/ajc.recipe index ea989b4b4c..031fe13170 100644 --- a/resources/recipes/ajc.recipe +++ b/resources/recipes/ajc.recipe @@ -16,6 +16,7 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe): title = 'The AJC' timefmt = ' [%a,%d %B %Y %I:%M %p]' __author__ = 'TonytheBookworm' + language = 'en' description = 'News from Atlanta and USA' publisher = 'The Atlanta Journal' category = 'news, politics, USA' diff --git a/resources/recipes/china_economic_net.recipe b/resources/recipes/china_economic_net.recipe index 825ea007c2..6fcb2e36ed 100644 --- a/resources/recipes/china_economic_net.recipe +++ b/resources/recipes/china_economic_net.recipe @@ -26,7 +26,7 @@ class AdvancedUserRecipe1278162597(BasicNewsRecipe): remove_javascript = True use_embedded_content = False no_stylesheets = True - language = 'zh-cn' + language = 'zh_CN' encoding = 'gb2312' conversion_options = {'linearize_tables':True} diff --git a/resources/recipes/cinebel_be.recipe b/resources/recipes/cinebel_be.recipe new file mode 100644 index 0000000000..ec76bfc894 --- /dev/null +++ b/resources/recipes/cinebel_be.recipe @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +cinebel.be +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class Cinebel(BasicNewsRecipe): + title = u'Cinebel' + __author__ = u'Lionel Bergeret' + description = u'Cinema news from Belgium in French' + publisher = u'cinebel.be' + category = 'news, cinema, movie, Belgium' + oldest_article = 3 + encoding = 'utf8' + language = 'fr_BE' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'span', attrs = {'class': 'movieMainTitle'}) + ,dict(name = 'div', attrs = {'id': 'filmPoster'}) + ,dict(name = 'div', attrs = {'id': 'filmDefinition'}) + ,dict(name = 'div', attrs = {'id': 'synopsis'}) + ] + + feeds = [ + (u'Les sorties de la semaine' , u'http://www.cinebel.be/Servlets/RssServlet?languageCode=fr&rssType=0' ) + ,(u'Top 10' , u'http://www.cinebel.be/Servlets/RssServlet?languageCode=fr&rssType=2' ) + ] + + def get_cover_url(self): + cover_url = 'http://www.cinebel.be/portal/resources/common/logo_index.gif' + return cover_url diff --git a/resources/recipes/dhnet_be.recipe b/resources/recipes/dhnet_be.recipe index a827ae307f..ef4d1736e3 100644 --- a/resources/recipes/dhnet_be.recipe +++ b/resources/recipes/dhnet_be.recipe @@ -6,6 +6,7 @@ __copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' dhnet.be ''' +from calibre import strftime from calibre.web.feeds.news import BasicNewsRecipe class DHNetBe(BasicNewsRecipe): @@ -15,7 +16,7 @@ class DHNetBe(BasicNewsRecipe): publisher = u'dhnet.be' category = 'news, Belgium' oldest_article = 3 - language = 'fr' + language = 'fr_BE' max_articles_per_feed = 20 no_stylesheets = True @@ -29,6 +30,10 @@ class DHNetBe(BasicNewsRecipe): feeds = [ (u'La Une' , u'http://www.dhnet.be/rss' ) - ,(u'La Une Sports' , u'http://www.dhnet.be/rss/dhsports/' ) - ,(u'La Une Info' , u'http://www.dhnet.be/rss/dhinfos/' ) + ,(u'La Une Sports' , u'http://www.dhnet.be/rss/dhsports/' ) + ,(u'La Une Info' , u'http://www.dhnet.be/rss/dhinfos/' ) ] + + def get_cover_url(self): + cover_url = strftime('http://pdf-online.dhnet.be/pdfonline/image/%Y%m%d/dh_%Y%m%d_nam_infoge_001.pdf.L.jpg') + return cover_url diff --git a/resources/recipes/journalgazette.recipe b/resources/recipes/journalgazette.recipe index 406917f5ce..4f12e92280 100644 --- a/resources/recipes/journalgazette.recipe +++ b/resources/recipes/journalgazette.recipe @@ -11,6 +11,7 @@ class AdvancedUserRecipe1283666183(BasicNewsRecipe): title = u'Journal Gazette Ft. Wayne IN' __author__ = 'cynvision' oldest_article = 1 + language = 'en' max_articles_per_feed = 8 no_stylesheets = True remove_javascript = True diff --git a/resources/recipes/lalibre_be.recipe b/resources/recipes/lalibre_be.recipe new file mode 100644 index 0000000000..53e346bf12 --- /dev/null +++ b/resources/recipes/lalibre_be.recipe @@ -0,0 +1,43 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +lalibre.be +''' + +from calibre import strftime +from calibre.web.feeds.news import BasicNewsRecipe + +class LaLibre(BasicNewsRecipe): + title = u'La Libre Belgique' + __author__ = u'Lionel Bergeret' + description = u'News from Belgium in French' + publisher = u'lalibre.be' + category = 'news, Belgium' + oldest_article = 3 + language = 'fr_BE' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'div', attrs = {'id': 'articleHat'}) + ,dict(name = 'p', attrs = {'id': 'publicationDate'}) + ,dict(name = 'div', attrs = {'id': 'articleText'}) + ] + + feeds = [ + (u'L\'actu' , u'http://www.lalibre.be/rss/?section=10' ) + ,(u'Culture' , u'http://www.lalibre.be/rss/?section=5' ) + ,(u'Economie' , u'http://www.lalibre.be/rss/?section=3' ) + ,(u'Libre Entreprise' , u'http://www.lalibre.be/rss/?section=904' ) + ,(u'Sports' , u'http://www.lalibre.be/rss/?section=2' ) + ,(u'Societe' , u'http://www.lalibre.be/rss/?section=12' ) + ] + + def get_cover_url(self): + cover_url = strftime('http://pdf-online.lalibre.be/pdfonline/image/%Y%m%d/llb_%Y%m%d_nam_libre_001.pdf.L.jpg') + return cover_url diff --git a/resources/recipes/lameuse_be.recipe b/resources/recipes/lameuse_be.recipe new file mode 100644 index 0000000000..03b7f84a5f --- /dev/null +++ b/resources/recipes/lameuse_be.recipe @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +lameuse.be +''' + +from calibre import strftime +from calibre.web.feeds.news import BasicNewsRecipe + +class LaMeuse(BasicNewsRecipe): + title = u'La Meuse' + __author__ = u'Lionel Bergeret' + description = u'News from Belgium in French' + publisher = u'lameuse.be' + category = 'news, Belgium' + oldest_article = 3 + encoding = 'utf8' + language = 'fr_BE' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'div', attrs = {'id': 'article'}) + ] + + remove_tags = [ + dict(name = 'div', attrs = {'class': 'sb-group'}) + ,dict(name = 'div', attrs = {'id': 'share'}) + ,dict(name = 'div', attrs = {'id': 'commentaires'}) + ] + + feeds = [ + (u'Actualite', u'http://www.lameuse.be/services/fils_rss/actualite/index.xml' ) + ,(u'Belgique', u'http://www.lameuse.be/services/fils_rss/actualite/belgique/index.xml' ) + ,(u'Monde', u'http://www.lameuse.be/services/fils_rss/actualite/monde/index.xml' ) + ,(u'Societe', u'http://www.lameuse.be/services/fils_rss/actualite/societe/index.xml' ) + ,(u'Faits Divers', u'http://www.lameuse.be/services/fils_rss/actualite/faits_divers/index.xml' ) + ,(u'Economie', u'http://www.lameuse.be/services/fils_rss/actualite/economie/index.xml' ) + ,(u'Science', u'http://www.lameuse.be/services/fils_rss/actualite/science/index.xml' ) + ,(u'Sante', u'http://www.lameuse.be/services/fils_rss/actualite/sante/index.xml' ) + ,(u'Insolite', u'http://www.lameuse.be/services/fils_rss/magazine/insolite/index.xml' ) + ,(u'Cinema', u'http://www.lameuse.be/services/fils_rss/culture/cinema/index.xml' ) + ,(u'Musique', u'http://www.lameuse.be/services/fils_rss/culture/musique/index.xml' ) + ,(u'Livres', u'http://www.lameuse.be/services/fils_rss/culture/livres/index.xml' ) + ] + + def get_cover_url(self): + cover_url = strftime('http://pdf.lameuse.be/pdf/lameuse_%Y-%m-%d_LIEG_ACTUALITE_1.PDF') + return cover_url diff --git a/resources/recipes/lavenir_be.recipe b/resources/recipes/lavenir_be.recipe new file mode 100644 index 0000000000..68be449ae5 --- /dev/null +++ b/resources/recipes/lavenir_be.recipe @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' +''' +lavenir.net +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class LAvenir(BasicNewsRecipe): + title = u'L\'Avenir' + __author__ = u'Lionel Bergeret' + description = u'News from Belgium in French' + publisher = u'lavenir.net' + category = 'news, Belgium' + oldest_article = 3 + encoding = 'utf8' + language = 'fr_BE' + + max_articles_per_feed = 20 + no_stylesheets = True + use_embedded_content = False + timefmt = ' [%d %b %Y]' + + keep_only_tags = [ + dict(name = 'div', attrs = {'class': 'photo'}) + ,dict(name = 'p', attrs = {'class': 'intro'}) + ,dict(name = 'div', attrs = {'class': 'article-body'}) + ] + + feeds = [ + (u'Belgique' , u'http://www.lavenir.net/rss.aspx?foto=1&intro=1§ion=info&info=df156511-c24f-4f21-81c3-a5d439a9cf4b' ) + ,(u'Monde' , u'http://www.lavenir.net/rss.aspx?foto=1&intro=1§ion=info&info=1642237c-66b9-4e8a-a8c1-288d61fefe7e' ) + ,(u'Societe' , u'http://www.lavenir.net/rss.aspx?foto=1&intro=1§ion=info&info=12e1a2f4-7e03-4cf1-afec-016869072317' ) + ] + + def get_cover_url(self): + cover_url = 'http://www.lavenir.net/extra/Static/journal/Pdf/1/UNE_Nationale.PDF' + return cover_url diff --git a/resources/recipes/lesoir_be.recipe b/resources/recipes/lesoir_be.recipe index 600ef6bc29..6b6891c3b8 100644 --- a/resources/recipes/lesoir_be.recipe +++ b/resources/recipes/lesoir_be.recipe @@ -6,6 +6,7 @@ __copyright__ = '2008, Lionel Bergeret <lbergeret at gmail.com>' lesoir.be ''' +from calibre import strftime from calibre.web.feeds.news import BasicNewsRecipe class LeSoirBe(BasicNewsRecipe): @@ -15,7 +16,7 @@ class LeSoirBe(BasicNewsRecipe): publisher = u'lesoir.be' category = 'news, Belgium' oldest_article = 3 - language = 'fr' + language = 'fr_BE' max_articles_per_feed = 20 no_stylesheets = True @@ -35,9 +36,13 @@ class LeSoirBe(BasicNewsRecipe): feeds = [ (u'Belgique' , u'http://www.lesoir.be/actualite/belgique/rss.xml' ) - ,(u'France' , u'http://www.lesoir.be/actualite/france/rss.xml' ) - ,(u'Monde' , u'http://www.lesoir.be/actualite/monde/rss.xml' ) - ,(u'Regions' , u'http://www.lesoir.be/regions/rss.xml' ) - ,(u'Vie du Net' , u'http://www.lesoir.be/actualite/vie_du_net/rss.xml' ) - ,(u'Petite Gazette' , u'http://www.lesoir.be/actualite/sciences/rss.xml' ) + ,(u'France' , u'http://www.lesoir.be/actualite/france/rss.xml' ) + ,(u'Monde' , u'http://www.lesoir.be/actualite/monde/rss.xml' ) + ,(u'Regions' , u'http://www.lesoir.be/regions/rss.xml' ) + ,(u'Vie du Net' , u'http://www.lesoir.be/actualite/vie_du_net/rss.xml' ) + ,(u'Petite Gazette' , u'http://www.lesoir.be/actualite/sciences/rss.xml' ) ] + + def get_cover_url(self): + cover_url = strftime( 'http://pdf.lesoir.be/pdf/%Y-%m-%d_BRUX_UNE_1.PDF') + return cover_url diff --git a/resources/recipes/onionavclub.recipe b/resources/recipes/onionavclub.recipe index 5bc069b6ed..038111cbe9 100644 --- a/resources/recipes/onionavclub.recipe +++ b/resources/recipes/onionavclub.recipe @@ -12,6 +12,7 @@ class BBC(BasicNewsRecipe): title = u'The Onion AV Club' __author__ = 'Stephen Williams' description = 'Film, Television and Music Reviews' + language = 'en' no_stylesheets = True oldest_article = 2 max_articles_per_feed = 100 diff --git a/resources/recipes/technology_review.recipe b/resources/recipes/technology_review.recipe index f001fcf4c1..cc8f13733e 100644 --- a/resources/recipes/technology_review.recipe +++ b/resources/recipes/technology_review.recipe @@ -7,6 +7,7 @@ class TechnologyReview(BasicNewsRecipe): description = 'MIT Technology Magazine' publisher = 'Technology Review Inc.' category = 'Technology, Innovation, R&D' + language = 'en' oldest_article = 14 max_articles_per_feed = 100 No_stylesheets = True diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 94f3923acf..2532962bf6 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -112,6 +112,7 @@ _extra_lang_codes = { 'en_CN' : _('English (China)'), 'es_PY' : _('Spanish (Paraguay)'), 'de_AT' : _('German (AT)'), + 'fr_BE' : _('French (BE)'), 'nl' : _('Dutch (NL)'), 'nl_BE' : _('Dutch (BE)'), 'und' : _('Unknown') From 67722fca23b3dee4203e685575953e230afef887 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 10:56:19 -0600 Subject: [PATCH 217/235] Fix #7002 (Support for dates before 1900) --- src/calibre/ebooks/epub/fix/epubcheck.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/epub/fix/epubcheck.py b/src/calibre/ebooks/epub/fix/epubcheck.py index fd913a654b..81f4ce4d80 100644 --- a/src/calibre/ebooks/epub/fix/epubcheck.py +++ b/src/calibre/ebooks/epub/fix/epubcheck.py @@ -43,7 +43,11 @@ class Epubcheck(ePubFixer): default=default) except: raise InvalidEpub('Invalid date set in OPF', raw) - sval = ts.strftime('%Y-%m-%d') + try: + sval = ts.strftime('%Y-%m-%d') + except: + from calibre import strftime + sval = strftime('%Y-%m-%d', ts.timetuple()) if sval != raw: self.log.error( 'OPF contains date', raw, 'that epubcheck does not like') From a22dbab0c0170816e70ed5a8af3916c2c36a8f97 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 11:02:39 -0600 Subject: [PATCH 218/235] Fix #7003 (Error when converting HTML/ZIP to RTF) --- src/calibre/ebooks/rtf/rtfml.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/rtf/rtfml.py b/src/calibre/ebooks/rtf/rtfml.py index c3d8cb38fc..3869c05152 100644 --- a/src/calibre/ebooks/rtf/rtfml.py +++ b/src/calibre/ebooks/rtf/rtfml.py @@ -10,13 +10,6 @@ Transform OEB content into RTF markup import os import re - -try: - from PIL import Image - Image -except ImportError: - import Image - import cStringIO from lxml import etree @@ -26,6 +19,7 @@ from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace, \ from calibre.ebooks.oeb.stylizer import Stylizer from calibre.ebooks.metadata import authors_to_string from calibre.utils.filenames import ascii_text +from calibre.utils.magick.draw import save_cover_data_to, identify_data TAGS = { 'b': '\\b', @@ -153,10 +147,8 @@ class RTFMLizer(object): return text def image_to_hexstring(self, data): - im = Image.open(cStringIO.StringIO(data)) - data = cStringIO.StringIO() - im.convert('RGB').save(data, 'JPEG') - data = data.getvalue() + data = save_cover_data_to(data, 'cover.jpg', return_data=True) + width, height = identify_data(data)[:2] raw_hex = '' for char in data: @@ -173,7 +165,7 @@ class RTFMLizer(object): col += 1 hex_string += char - return (hex_string, im.size[0], im.size[1]) + return (hex_string, width, height) def clean_text(self, text): # Remove excess spaces at beginning and end of lines From 571df3dc7eeec2d5594f667e230a2c5c2c98bc70 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 11:17:26 -0600 Subject: [PATCH 219/235] revert version number to 0.7.20 --- src/calibre/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 7c16b9020c..bb82d6a3c1 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.7.906' +__version__ = '0.7.20' __author__ = "Kovid Goyal <kovid@kovidgoyal.net>" import re From 99cfbc74457b29017a9e108449251054e4d178d7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 11:41:27 -0600 Subject: [PATCH 220/235] ... --- src/calibre/gui2/add.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 1d7b5075b4..1339070446 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -152,7 +152,8 @@ class DBAdder(Thread): # {{{ mi.application_id = None if self.db is not None: if cover: - cover = open(cover, 'rb').read() + with open(cover, 'rb') as f: + cover = f.read() orig_formats = formats formats = [f for f in formats if not f.lower().endswith('.opf')] if prefs['add_formats_to_existing']: From 284089aabc329300ddd913b164679df953dfea57 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 11:50:42 -0600 Subject: [PATCH 221/235] Updated translations template --- src/calibre/gui2/dialogs/metadata_bulk.py | 3 +- src/calibre/translations/calibre.pot | 6446 +++++++++++---------- 2 files changed, 3344 insertions(+), 3105 deletions(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 6b41434347..e27f4b5eab 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -272,8 +272,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): 'Changes are permanent. There is no undo function. ' ' This feature is experimental, and there may be bugs. ' 'You are strongly encouraged to back up your library ' - 'before proceeding.' - + '<p>' + + 'before proceeding.<p>' 'Search and replace in text fields using character matching ' 'or regular expressions. ') diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 8e87b1c47d..aa0c3de442 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.7.20\n" -"POT-Creation-Date: 2010-09-29 13:23+MDT\n" -"PO-Revision-Date: 2010-09-29 13:23+MDT\n" +"POT-Creation-Date: 2010-09-30 11:49+MDT\n" +"PO-Revision-Date: 2010-09-30 11:49+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -15,540 +15,550 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:43 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43 msgid "Does absolutely nothing" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:46 -#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:74 -#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:76 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/books.py:46 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:412 -#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:70 -#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:71 -#: /home/kovid/work/trunk/src/calibre/devices/prs500/books.py:267 -#: /home/kovid/work/trunk/src/calibre/devices/prs505/sony_cache.py:526 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:405 -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:97 -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/input.py:100 -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/metadata.py:56 -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:407 -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:70 -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:72 -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:336 -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:339 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1894 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1896 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:24 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:240 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:283 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:286 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:402 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/book/base.py:20 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/book/base.py:21 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:36 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/ereader.py:61 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fb2.py:46 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:333 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:36 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:64 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:66 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:123 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/meta.py:125 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:945 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1057 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdb.py:39 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pdf.py:28 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:23 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/pml.py:49 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/txt.py:14 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:39 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:65 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:78 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:119 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:153 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:611 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:817 -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:819 -#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:49 -#: /home/kovid/work/trunk/src/calibre/ebooks/odt/input.py:51 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:911 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:916 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:982 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:137 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/reader.py:139 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:64 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:112 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:118 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:173 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/writer.py:174 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:39 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/palmdoc/writer.py:29 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ztxt/writer.py:27 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:82 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:83 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:73 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:74 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:63 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:64 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:65 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:66 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:63 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:64 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:62 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:63 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:81 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:82 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:97 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/writer.py:98 -#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:239 -#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:241 -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:352 -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:359 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:296 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:299 -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:137 -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:144 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/__init__.py:42 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:111 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:136 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:138 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:869 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:878 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1162 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1165 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:47 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:120 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:155 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:571 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:173 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:357 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:377 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:877 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1062 -#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:91 -#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:96 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:187 -#: /home/kovid/work/trunk/src/calibre/library/cli.py:213 -#: /home/kovid/work/trunk/src/calibre/library/database.py:913 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:375 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:387 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1070 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1145 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1849 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1851 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1978 -#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:214 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:137 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:140 -#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:72 -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:117 -#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:46 -#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:64 -#: /home/kovid/work/trunk/src/calibre/utils/podofo/__init__.py:78 -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47 -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:50 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46 +#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74 +#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:76 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/books.py:24 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:412 +#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:70 +#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71 +#: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:526 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:398 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:100 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:407 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:70 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:72 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:336 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:339 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1894 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1896 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:223 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:29 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:66 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:346 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:351 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:551 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:46 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:333 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:65 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:36 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:123 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:125 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1017 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1129 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdb.py:39 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:28 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:23 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pml.py:49 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:14 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:39 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:65 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:78 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:119 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:153 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:611 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:817 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:819 +#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49 +#: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:911 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:916 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:982 +#: /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/transforms/jacket.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:112 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:118 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:173 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:39 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/palmdoc/writer.py:29 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ztxt/writer.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:82 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:83 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:73 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:74 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:63 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:65 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:66 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:63 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:62 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:63 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:81 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:82 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:98 +#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:239 +#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:355 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:362 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:302 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:305 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:894 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:903 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1187 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1190 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:571 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:380 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:399 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:912 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1100 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:187 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:215 +#: /home/kovid/work/calibre/src/calibre/library/database.py:913 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:396 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:408 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1256 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1357 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2106 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2108 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2235 +#: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:219 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:139 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:142 +#: /home/kovid/work/calibre/src/calibre/library/server/xml.py:76 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:118 +#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:46 +#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:64 +#: /home/kovid/work/calibre/src/calibre/utils/podofo/__init__.py:78 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:50 msgid "Unknown" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:64 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64 msgid "Base" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:172 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:172 msgid "File type" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:208 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:208 msgid "Metadata reader" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:238 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:238 msgid "Metadata writer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:268 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:268 msgid "Catalog generator" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:369 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:369 msgid "User Interface Action" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/__init__.py:386 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:22 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:187 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:251 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:273 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206 msgid "Preferences" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:17 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:17 msgid "Follow all local links in an HTML file and create a ZIP file containing all linked files. This plugin is run every time you add an HTML file to the library." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:53 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53 msgid "Character encoding for the input HTML files. Common choices include: cp1252, latin1, iso-8859-1 and utf-8." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:60 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:60 msgid "Create a PMLZ archive containing the PML file and all images in the directory pmlname_img or images. This plugin is run every time you add a PML file to the library." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:94 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94 msgid "Extract cover from comic files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:121 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:132 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:144 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:154 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:164 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:175 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:185 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:195 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:205 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:215 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:225 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:236 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:247 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:259 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:280 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:291 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:301 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:311 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:121 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:132 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:144 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:154 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:164 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:205 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:215 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:225 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:235 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:246 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:258 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:279 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:290 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:300 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:310 msgid "Read metadata from %s files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:270 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:269 msgid "Read metadata from ebooks in RAR archives" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:322 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:321 msgid "Read metadata from ebooks in ZIP archives" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:335 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:345 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:355 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:377 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:388 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:398 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:334 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:344 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:354 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:376 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:387 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:397 msgid "Set metadata in %s files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:366 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:365 msgid "Set metadata from %s files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:688 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:688 msgid "Look and Feel" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:690 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:702 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:713 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:724 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:690 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:702 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:713 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:724 msgid "Interface" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:694 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:694 msgid "Adjust the look and feel of the calibre interface to suit your tastes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:700 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:700 msgid "Behavior" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:706 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:706 msgid "Change the way calibre behaves" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:711 -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:176 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:711 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:177 msgid "Add your own columns" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:717 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:717 msgid "Add/remove your own columns to the calibre book list" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:722 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:722 msgid "Customize the toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:728 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:728 msgid "Customize the toolbars and context menus, changing which actions are available in each" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:734 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:734 msgid "Input Options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:736 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:747 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:758 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:736 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:747 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:758 msgid "Conversion" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:740 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:740 msgid "Set conversion options specific to each input format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:745 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:745 msgid "Common Options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:751 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:751 msgid "Set conversion options common to all formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:756 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:756 msgid "Output Options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:762 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:762 msgid "Set conversion options specific to each output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:767 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:767 msgid "Adding books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:769 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:781 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:793 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:769 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:781 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:793 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:805 msgid "Import/Export" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:773 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:773 msgid "Control how calibre reads metadata from files when adding books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:779 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:779 msgid "Saving books to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:785 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:785 msgid "Control how calibre exports files from its database to disk when using Save to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:791 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:791 msgid "Sending books to devices" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:797 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:797 msgid "Control how calibre transfers files to your ebook reader" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:803 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:803 +msgid "Metadata plugboards" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:809 +msgid "Change metadata fields before saving/sending" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:814 msgid "Sharing books by email" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:805 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:817 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:816 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:828 msgid "Sharing" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:809 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:820 msgid "Setup sharing of books via email. Can be used for automatic sending of downloaded news to your devices" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:815 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:826 msgid "Sharing over the net" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:821 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:832 msgid "Setup the calibre Content Server which will give you access to your calibre library from anywhere, on any device, over the internet" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:828 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:839 msgid "Plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:830 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:842 -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:853 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:841 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:853 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:864 msgid "Advanced" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:834 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:845 msgid "Add/remove/customize various bits of calibre functionality" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:840 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:851 msgid "Tweaks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:846 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:857 msgid "Fine tune how calibre behaves in various contexts" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:851 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862 msgid "Miscellaneous" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/builtins.py:857 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868 msgid "Miscellaneous advanced configuration" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:102 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102 msgid "Conversion Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:129 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:129 msgid "Specify the character encoding of the input document. If set this option will override any encoding declared by the document itself. Particularly useful for documents that do not declare an encoding or that have erroneous encoding declarations." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:241 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:241 msgid "Conversion Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/conversion.py:255 +#: /home/kovid/work/calibre/src/calibre/customize/conversion.py:255 msgid "If specified, the output plugin will try to create output that is as human readable as possible. May not have any effect for some output plugins." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:46 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:46 msgid "Input profile" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:50 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:50 msgid "This profile tries to provide sane defaults and is useful if you know nothing about the input document." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:58 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:422 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:58 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:422 msgid "This profile is intended for the SONY PRS line. The 500/505/600/700 etc." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:70 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:70 msgid "This profile is intended for the SONY PRS 300." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:79 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:459 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:79 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:459 msgid "This profile is intended for the SONY PRS-900." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:87 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:489 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:87 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:489 msgid "This profile is intended for the Microsoft Reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:98 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:500 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:98 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:500 msgid "This profile is intended for the Mobipocket books." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:111 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:513 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:111 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:513 msgid "This profile is intended for the Hanlin V3 and its clones." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:123 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:525 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:123 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:525 msgid "This profile is intended for the Hanlin V5 and its clones." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:133 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:533 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:133 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:533 msgid "This profile is intended for the Cybook G3." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:146 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:546 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:146 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:546 msgid "This profile is intended for the Cybook Opus." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:158 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:557 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:158 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:557 msgid "This profile is intended for the Amazon Kindle." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:170 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:595 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:170 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:595 msgid "This profile is intended for the Irex Illiad." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:182 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:608 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:182 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:608 msgid "This profile is intended for the IRex Digital Reader 1000." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:195 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:622 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:195 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:622 msgid "This profile is intended for the IRex Digital Reader 800." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:207 -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:636 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:207 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:636 msgid "This profile is intended for the B&N Nook." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:229 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:229 msgid "Output profile" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:233 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:233 msgid "This profile tries to provide sane defaults and is useful if you want to produce a document intended to be read at a computer or on a range of devices." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:266 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:266 msgid "Intended for the iPad and similar devices with a resolution of 768x1024" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:437 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:437 msgid "This profile is intended for the Kobo Reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:450 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:450 msgid "This profile is intended for the SONY PRS-300." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:468 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:468 msgid "This profile is intended for the 5-inch JetBook." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:477 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:477 msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc, in landscape mode. Mainly useful for comics." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/profiles.py:577 +#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:577 msgid "This profile is intended for the Amazon Kindle DX." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:34 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:34 msgid "Installed plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:35 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35 msgid "Mapping for filetype plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:36 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36 msgid "Local plugin customization" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:37 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37 msgid "Disabled plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:38 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38 msgid "Enabled plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:93 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:93 msgid "No valid plugin found in " msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:508 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:508 msgid "Initialization of plugin %s failed with traceback:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:541 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:541 msgid "" " %prog options\n" "\n" @@ -556,636 +566,640 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:547 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:547 msgid "Add a plugin by specifying the path to the zip file containing it." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:549 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:549 msgid "Remove a custom plugin by name. Has no effect on builtin plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:551 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:551 msgid "Customize plugin. Specify name of plugin and customization string separated by a comma." msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:553 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:553 msgid "List all installed plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:555 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:555 msgid "Enable the named plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/customize/ui.py:557 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:557 msgid "Disable the named plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:13 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:13 msgid "Communicate with Android phones." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:52 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:52 msgid "Comma separated list of directories to send e-books to on the device. The first one that exists will be used" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/android/driver.py:94 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:94 msgid "Communicate with S60 phones." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:85 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:86 msgid "Apple device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:87 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:88 msgid "Communicate with iTunes/iBooks." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:93 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:94 msgid "Apple device detected, launching iTunes, please wait ..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:246 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:249 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:247 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:250 msgid "Updating device metadata listing..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:323 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:362 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:922 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:962 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2831 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2871 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:324 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:363 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:923 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:963 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2832 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2872 msgid "%d of %d" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:369 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:967 -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2877 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:370 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:968 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2878 msgid "finished" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:544 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:545 msgid "Use Series as Category in iTunes/iBooks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:546 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:547 msgid "Cache covers from iTunes/iBooks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:558 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:559 msgid "" "Some books not found in iTunes database.\n" "Delete using the iBooks app.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:886 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:887 msgid "" "Some cover art could not be converted.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2499 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:817 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:823 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:851 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:244 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:198 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:211 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1718 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:134 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2500 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:817 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:823 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:853 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:248 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:209 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:222 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1966 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:135 msgid "News" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2500 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:20 -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:556 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1681 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:1699 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2501 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:20 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:556 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1929 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1947 msgid "Catalog" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/apple/driver.py:2738 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2739 msgid "Communicate with iTunes." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/binatone/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/binatone/driver.py:17 msgid "Communicate with the Binatone Readme eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:13 +#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:13 msgid "Communicate with the Blackberry smart phone." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/blackberry/driver.py:14 -#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:18 -#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:90 +#: /home/kovid/work/calibre/src/calibre/devices/blackberry/driver.py:14 +#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:18 +#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:90 msgid "Kovid Goyal" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/cybook/driver.py:22 +#: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:24 +#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:24 msgid "Communicate with the EB600 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:193 +#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:193 msgid "Communicate with the Astak Mentor EB600" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/eb600/driver.py:216 +#: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:216 msgid "Communicate with the PocketBook 301 reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:17 msgid "Entourage Edge" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/edge/driver.py:18 +#: /home/kovid/work/calibre/src/calibre/devices/edge/driver.py:18 msgid "Communicate with the Entourage Edge." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:16 +#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:16 msgid "Communicate with the ESlick eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/eslick/driver.py:49 +#: /home/kovid/work/calibre/src/calibre/devices/eslick/driver.py:49 msgid "Communicate with the Sigmatek eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:16 -#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:30 +#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:16 +#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:30 msgid "Use an arbitrary folder as a device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/folder_device/driver.py:26 -#: /home/kovid/work/trunk/src/calibre/devices/interface.py:14 +#: /home/kovid/work/calibre/src/calibre/devices/folder_device/driver.py:26 +#: /home/kovid/work/calibre/src/calibre/devices/interface.py:14 msgid "Device Interface" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:19 +#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:19 msgid "Communicate with Hanlin V3 eBook readers." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:96 +#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:96 msgid "Communicate with Hanlin V5 eBook readers." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:115 +#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:115 msgid "Communicate with the BOOX eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanlin/driver.py:132 +#: /home/kovid/work/calibre/src/calibre/devices/hanlin/driver.py:132 msgid "Comma separated list of directories to send e-books to on the device. The first one that exists will be used." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:22 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:22 msgid "Communicate with the Hanvon N520 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:47 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:47 msgid "Communicate with The Book reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:59 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:59 msgid "Communicate with the SpringDesign Alex eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:78 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:78 msgid "Communicate with the Azbooka" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/hanvon/driver.py:94 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:94 msgid "Communicate with the Elonex EB 511 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:16 +#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:16 msgid "Communicate with the IRex Iliad eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/iliad/driver.py:17 -#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:18 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:42 +#: /home/kovid/work/calibre/src/calibre/devices/iliad/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:18 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:42 msgid "John Schember" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:16 +#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:16 msgid "Communicate with the IRex Digital Reader 1000 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/irexdr/driver.py:42 +#: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:42 msgid "Communicate with the IRex Digital Reader 800" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/iriver/driver.py:15 +#: /home/kovid/work/calibre/src/calibre/devices/iriver/driver.py:15 msgid "Communicate with the Iriver Story reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:20 +#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:20 msgid "Communicate with the JetBook eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/jetbook/driver.py:88 +#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:88 msgid "Communicate with the MiBuk Wolder reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:43 +#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:116 +msgid "Communicate with the JetBook Mini reader." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:43 msgid "Communicate with the Kindle eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:170 +#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:170 msgid "Communicate with the Kindle 2/3 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kindle/driver.py:211 +#: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:211 msgid "Communicate with the Kindle DX eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:23 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:23 msgid "Communicate with the Kobo Reader" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:47 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:47 msgid "The Kobo supports only one collection currently: the \"Im_Reading\" list. Create a tag called \"Im_Reading\" " msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:63 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:66 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:69 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:188 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:68 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:71 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:74 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:136 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:143 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:166 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:63 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:66 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:69 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:188 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:68 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:71 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:74 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:136 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:143 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:166 msgid "Getting list of books on device..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:248 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:280 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:253 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:271 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:248 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:280 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:253 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:271 msgid "Removing books from device..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:284 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:291 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:278 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:283 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:284 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:291 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:278 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:283 msgid "Removing books from device metadata listing..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:296 -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:330 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:217 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:247 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:296 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:330 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:217 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:247 msgid "Adding books to device metadata listing..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:392 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:252 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:392 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:252 msgid "Not Implemented" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/kobo/driver.py:393 +#: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:393 msgid "\".kobo\" files do not exist on the device as books instead, they are rows in the sqlite database. Currently they cannot be exported or viewed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:17 msgid "Communicate with the Palm Pre" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:37 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:37 msgid "Communicate with the Booq Avant" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:58 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:58 msgid "Communicate with the Sweex MM300" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:79 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:79 msgid "Communicate with the Kogan" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:87 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:87 msgid "Communicate with the Pandigital Novel" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/misc.py:114 +#: /home/kovid/work/calibre/src/calibre/devices/misc.py:114 msgid "Communicate with the GM2000" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:17 msgid "Communicate with the Nokia 770 internet tablet." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:40 +#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:40 msgid "Communicate with the Nokia 810 internet tablet." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nokia/driver.py:74 +#: /home/kovid/work/calibre/src/calibre/devices/nokia/driver.py:74 msgid "Communicate with the Nokia E52" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:20 +#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:20 msgid "The Nook" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nook/driver.py:21 +#: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:21 msgid "Communicate with the Nook eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/nuut2/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/nuut2/driver.py:17 msgid "Communicate with the Nuut2 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/prs500/driver.py:89 +#: /home/kovid/work/calibre/src/calibre/devices/prs500/driver.py:89 msgid "Communicate with the Sony PRS-500 eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:22 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:22 msgid "Communicate with all the Sony eBook readers." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/prs505/driver.py:61 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61 msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/prs505/sony_cache.py:149 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/structure.py:68 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:149 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:68 msgid "Unnamed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/sne/driver.py:17 +#: /home/kovid/work/calibre/src/calibre/devices/sne/driver.py:17 msgid "Communicate with the Samsung SNE eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:11 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:11 msgid "Communicate with the Teclast K3/K5 reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:36 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:36 msgid "Communicate with the Newsmy reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:48 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:48 msgid "Communicate with the iPapyrus reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/teclast/driver.py:59 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:59 msgid "Communicate with the Sovos reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:255 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:255 msgid "Unable to detect the %s disk drive. Try rebooting." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:435 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:435 msgid "Unable to detect the %s mount point. Try rebooting." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:500 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:500 msgid "Unable to detect the %s disk drive." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:593 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:593 msgid "Could not find mount helper: %s." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:605 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:605 msgid "Unable to detect the %s disk drive. Your kernel is probably exporting a deprecated version of SYSFS." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:613 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:613 msgid "Unable to mount main memory (Error code: %d)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:750 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:752 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:750 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:752 msgid "The reader has no storage card in this slot." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:754 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:754 msgid "Selected slot: %s is not supported." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:783 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:783 msgid "There is insufficient free space in main memory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:785 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/device.py:787 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:785 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:787 msgid "There is insufficient free space on the storage card" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:12 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:12 msgid "Configure Device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:37 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:37 msgid "settings for device drivers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:39 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:39 msgid "Ordered list of formats the device will accept" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:41 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:41 msgid "Place files in sub directories if the device supports them" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:43 -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:86 msgid "Read metadata from files on device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:45 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:45 msgid "Use author sort instead of author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:47 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:47 msgid "Template to control how books are saved" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/deviceconfig.py:50 -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:89 msgid "Extra customization" msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:41 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:41 msgid "Communicate with an eBook reader." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:57 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:57 msgid "Get device information..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:194 -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:196 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:194 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196 msgid "Transferring books to device..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/devices/usbms/driver.py:314 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:313 msgid "Sending metadata to device..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:41 msgid "%prog [options] mybook.chm" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:42 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:42 msgid "Output directory. Defaults to current directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:45 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:589 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:45 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589 msgid "Set the book title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:47 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:591 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:47 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591 msgid "Set sort key for the title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:49 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:593 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:49 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593 msgid "Set the author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:51 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:595 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:51 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595 msgid "Set sort key for the author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:53 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:597 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:53 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:597 msgid "The category this book belongs to. E.g.: History" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:56 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:600 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:600 msgid "Path to a graphic that will be set as this files' thumbnail" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:59 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:59 msgid "Path to a txt file containing a comment." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:62 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:607 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:62 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607 msgid "Extract thumbnail from LRF file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:63 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:608 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:63 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:608 msgid "Set the publisher" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:64 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:609 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609 msgid "Set the book classification" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:65 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:610 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:65 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:610 msgid "Set the book creator" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:66 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:611 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:66 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611 msgid "Set the book producer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:68 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:613 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:68 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:613 msgid "Extract cover from LRF file. Note that the LRF format has no defined cover, so we use some heuristics to guess the cover." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:70 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:615 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:70 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:615 msgid "Set book ID" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/chm/reader.py:72 +#: /home/kovid/work/calibre/src/calibre/ebooks/chm/reader.py:72 msgid "Set font delta" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:182 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:182 msgid "Rendered %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:185 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:185 msgid "Failed %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:239 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:239 msgid "" "Failed to process comic: \n" "\n" "%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:258 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:258 msgid "Number of colors for grayscale image conversion. Default: %default. Values of less than 256 may result in blurred text on your device if you are creating your comics in EPUB format." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:262 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:262 msgid "Disable normalize (improve contrast) color range for pictures. Default: False" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:265 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:265 msgid "Maintain picture aspect ratio. Default is to fill the screen." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:267 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:267 msgid "Disable sharpening." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:269 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:269 msgid "Disable trimming of comic pages. For some comics, trimming might remove content as well as borders." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:272 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:272 msgid "Don't split landscape images into two portrait images" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:274 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:274 msgid "Keep aspect ratio and scale image using screen height as image width for viewing in landscape mode." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:277 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:277 msgid "Used for right-to-left publications like manga. Causes landscape pages to be split into portrait pages from right to left." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:281 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:281 msgid "Enable Despeckle. Reduces speckle noise. May greatly increase processing time." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:284 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:284 msgid "Don't sort the files found in the comic alphabetically by name. Instead use the order they were added to the comic." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:288 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:288 msgid "The format that images in the created ebook are converted to. You can experiment to see which format gives you optimal size and look on your device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:292 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:292 msgid "Apply no processing to the image" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:294 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:294 msgid "Do not convert the image to grayscale (black and white)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:431 -#: /home/kovid/work/trunk/src/calibre/ebooks/comic/input.py:442 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:431 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:442 msgid "Page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:19 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:19 msgid "" "input_file output_file [options]\n" "\n" @@ -1200,333 +1214,333 @@ msgid "" "For full documentation of the conversion system see\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:97 msgid "INPUT OPTIONS" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:98 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:98 msgid "Options to control the processing of the input %s file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:104 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:104 msgid "OUTPUT OPTIONS" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:105 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:105 msgid "Options to control the processing of the output %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:119 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:119 msgid "Options to control the look and feel of the output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:135 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:135 msgid "Control auto-detection of document structure." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:145 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:145 msgid "Control the automatic generation of a Table of Contents. By default, if the source file has a Table of Contents, it will be used in preference to the automatically generated one." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:155 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:155 msgid "Options to set metadata in the output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:158 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:158 msgid "Options to help with debugging the conversion" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:183 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:183 msgid "List builtin recipes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/cli.py:256 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/cli.py:256 msgid "Output saved to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:95 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:95 msgid "Level of verbosity. Specify multiple times for greater verbosity." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:102 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:102 msgid "Save the output from different stages of the conversion pipeline to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:111 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:111 msgid "Specify the input profile. The input profile gives the conversion system information on how to interpret various information in the input document. For example resolution dependent lengths (i.e. lengths in pixels). Choices are:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:122 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:122 msgid "Specify the output profile. The output profile tells the conversion system how to optimize the created document for the specified device. In some cases, an output profile is required to produce documents that will work on a device. For example EPUB on the SONY reader. Choices are:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:133 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:133 msgid "The base font size in pts. All font sizes in the produced book will be rescaled based on this size. By choosing a larger size you can make the fonts in the output bigger and vice versa. By default, the base font size is chosen based on the output profile you chose." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:143 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:143 msgid "Mapping from CSS font names to font sizes in pts. An example setting is 12,12,14,16,18,20,22,24. These are the mappings for the sizes xx-small to xx-large, with the final size being for huge fonts. The font rescaling algorithm uses these sizes to intelligently rescale fonts. The default is to use a mapping based on the output profile you chose." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:155 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:155 msgid "Disable all rescaling of font sizes." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:162 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:162 msgid "The line height in pts. Controls spacing between consecutive lines of text. By default no line height manipulation is performed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:170 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:170 msgid "Some badly designed documents use tables to control the layout of text on the page. When converted these documents often have text that runs off the page and other artifacts. This option will extract the content from the tables and present it in a linear fashion." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:180 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:180 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level one. If this is specified, it takes precedence over other forms of auto-detection." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:189 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:189 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level two. Each entry is added under the previous level one entry." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:197 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:197 msgid "XPath expression that specifies all tags that should be added to the Table of Contents at level three. Each entry is added under the previous level two entry." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:205 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:205 msgid "Normally, if the source file already has a Table of Contents, it is used in preference to the auto-generated one. With this option, the auto-generated one is always used." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:213 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:213 msgid "Don't add auto-detected chapters to the Table of Contents." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:220 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:220 msgid "If fewer than this number of chapters is detected, then links are added to the Table of Contents. Default: %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:227 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:227 msgid "Maximum number of links to insert into the TOC. Set to 0 to disable. Default is: %default. Links are only added to the TOC if less than the threshold number of chapters were detected." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:235 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:235 msgid "Remove entries from the Table of Contents whose titles match the specified regular expression. Matching entries and all their children are removed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:246 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:246 msgid "An XPath expression to detect chapter titles. The default is to consider <h1> or <h2> tags that contain the words \"chapter\",\"book\",\"section\" or \"part\" as chapter titles as well as any tags that have class=\"chapter\". The expression used must evaluate to a list of elements. To disable chapter detection, use the expression \"/\". See the XPath Tutorial in the calibre User Manual for further help on using this feature." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:260 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:260 msgid "Specify how to mark detected chapters. A value of \"pagebreak\" will insert page breaks before chapters. A value of \"rule\" will insert a line before chapters. A value of \"none\" will disable chapter marking and a value of \"both\" will use both page breaks and lines to mark chapters." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:270 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:270 msgid "Either the path to a CSS stylesheet or raw CSS. This CSS will be appended to the style rules from the source file, so it can be used to override those rules." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:279 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:279 msgid "An XPath expression. Page breaks are inserted before the specified elements." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:285 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:285 msgid "Set the top margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:290 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:290 msgid "Set the bottom margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:295 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:295 msgid "Set the left margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:300 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:300 msgid "Set the right margin in pts. Default is %default. Note: 72 pts equals 1 inch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:306 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:306 msgid "Change text justification. A value of \"left\" converts all justified text in the source to left aligned (i.e. unjustified) text. A value of \"justify\" converts all unjustified text to justified. A value of \"original\" (the default) does not change justification in the source file. Note that only some output formats support justification." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:316 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:316 msgid "Remove spacing between paragraphs. Also sets an indent on paragraphs of 1.5em. Spacing removal will not work if the source file does not use paragraphs (<p> or <div> tags)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:323 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:323 msgid "When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:330 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:330 msgid "Use the cover detected from the source file in preference to the specified cover." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:336 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:336 msgid "Insert a blank line between paragraphs. Will not work if the source file does not use paragraphs (<p> or <div> tags)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:343 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:343 msgid "Remove the first image from the input ebook. Useful if the first image in the source file is a cover and you are specifying an external cover." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:351 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:351 msgid "Insert the book metadata at the start of the book. This is useful if your ebook reader does not support displaying/searching metadata directly." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:359 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:359 msgid "Attempt to detect and correct hard line breaks and other problems in the source file. This may make things worse, so use with care." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:367 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:367 msgid "Scale used to determine the length at which a line should be unwrapped if preprocess is enabled. Valid values are a decimal between 0 and 1. The default is 0.40, just below the median line length. This will unwrap typical books with hard line breaks, but should be reduced if the line length is variable." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:376 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:376 msgid "Convert plain quotes, dashes and ellipsis to their typographically correct equivalents. For details, see http://daringfireball.net/projects/smartypants" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:384 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:384 msgid "Use a regular expression to try and remove the header." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:391 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:391 msgid "The regular expression to use to remove the header." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:397 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:397 msgid "Use a regular expression to try and remove the footer." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:404 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:404 msgid "The regular expression to use to remove the footer." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:411 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:411 msgid "Read metadata from the specified OPF file. Metadata read from this file will override any metadata in the source file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:418 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:418 msgid "Transliterate unicode characters to an ASCII representation. Use with care because this will replace unicode characters with ASCII. For instance it will replace \"%s\" with \"Mikhail Gorbachiov\". Also, note that in cases where there are multiple representations of a character (characters shared by Chinese and Japanese for instance) the representation used by the largest number of people will be used (Chinese in the previous example)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:433 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:433 msgid "Preserve ligatures present in the input document. A ligature is a special rendering of a pair of characters like ff, fi, fl et cetera. Most readers do not have support for ligatures in their default fonts, so they are unlikely to render correctly. By default, calibre will turn a ligature into the corresponding pair of normal characters. This option will preserve them instead." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:445 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:38 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:445 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:38 msgid "Set the title." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:449 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:449 msgid "Set the authors. Multiple authors should be separated by ampersands." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:454 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:454 msgid "The version of the title to be used for sorting. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:458 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:458 msgid "String to be used when sorting by author. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:462 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:462 msgid "Set the cover to the specified file or URL" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:466 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:466 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:54 msgid "Set the ebook description." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:470 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:470 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:56 msgid "Set the ebook publisher." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:474 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:60 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:474 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:60 msgid "Set the series this ebook belongs to." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:478 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:62 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:478 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:62 msgid "Set the index of the book in this series." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:482 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:64 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:482 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:64 msgid "Set the rating. Should be a number between 1 and 5." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:486 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:66 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:486 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:66 msgid "Set the ISBN of the book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:490 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:68 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:490 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:68 msgid "Set the tags for the book. Should be a comma separated list." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:494 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:70 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:494 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:70 msgid "Set the book producer." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:498 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:72 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:498 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72 msgid "Set the language." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:502 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:502 msgid "Set the publication date." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:506 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:506 msgid "Set the book timestamp (used by the date column in calibre)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:606 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:606 msgid "Could not find an ebook inside the archive" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:664 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:664 msgid "Values of series index and rating must be numbers. Ignoring" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:671 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:671 msgid "Failed to parse date/time" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:826 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:826 msgid "Converting input to HTML..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:853 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:853 msgid "Running transforms on ebook..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/conversion/plumber.py:940 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:940 msgid "Creating" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/__init__.py:20 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:20 msgid "Failed to parse: %s with error: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/__init__.py:26 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/__init__.py:26 msgid "ePub Fixer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/epubcheck.py:18 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:18 msgid "Workaround epubcheck bugs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/epubcheck.py:22 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/epubcheck.py:22 msgid "Workarounds for bugs in the latest release of epubcheck. epubcheck reports many things as errors that are not actually errors. epub-fix will try to detect these and replace them with constructs that epubcheck likes. This may cause significant changes to your epub, complain to the epubcheck project." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/main.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:21 msgid "" "%prog [options] file.epub\n" "\n" @@ -1535,227 +1549,227 @@ msgid "" "By default, no fixing is done and messages are printed out for each error detected. Use the options to control which errors are automatically fixed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/main.py:52 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/main.py:52 msgid "You must specify an epub file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:17 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:17 msgid "Fix unmanifested files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:21 msgid "Fix unmanifested files. epub-fix can either add them to the manifest or delete them as specified by the delete unmanifested option." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/fix/unmanifested.py:32 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/fix/unmanifested.py:32 msgid "Delete unmanifested files instead of adding them to the manifest" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:56 msgid "Extract the contents of the generated EPUB file to the specified directory. The contents of the directory are first deleted, so be careful." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:62 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:62 msgid "Turn off splitting at page breaks. Normally, input files are automatically split at every page break into two files. This gives an output ebook that can be parsed faster and with less resources. However, splitting is slow and if your source file contains a very large number of page breaks, you should turn off splitting on page breaks." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:73 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:73 msgid "Split all HTML files larger than this size (in KB). This is necessary as most EPUB readers cannot handle large file sizes. The default of %defaultKB is the size required for Adobe Digital Editions." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:80 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:80 msgid "Normally, if the input file has no cover and you don't specify one, a default cover is generated with the title, authors, etc. This option disables the generation of this cover." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:86 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:86 msgid "Do not use SVG for the book cover. Use this option if your EPUB is going to be used on a device that does not support SVG, like the iPhone or the JetBook Lite. Without this option, such devices will display the cover as a blank page." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:94 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:94 msgid "When using an SVG cover, this option will cause the cover to scale to cover the available screen area, but still preserve its aspect ratio (ratio of width to height). That means there may be white borders at the sides or top and bottom of the image, but the image will never be distorted. Without this option the image may be slightly distorted, but there will be no borders." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/epub/output.py:169 +#: /home/kovid/work/calibre/src/calibre/ebooks/epub/output.py:169 msgid "Start" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/fb2ml.py:147 -#: /home/kovid/work/trunk/src/calibre/ebooks/rb/rbml.py:102 -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/txtml.py:77 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:147 +#: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:102 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77 msgid "Table of Contents:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/input.py:32 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:32 msgid "Do not insert a Table of Contents at the beginning of the book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:21 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:32 -#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:37 -#: /home/kovid/work/trunk/src/calibre/ebooks/rb/output.py:21 -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:35 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:32 +#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:37 +#: /home/kovid/work/calibre/src/calibre/ebooks/rb/output.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:35 msgid "Add Table of Contents to beginning of the book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/fb2/output.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:24 msgid "Try to turn chapters into individual sections. WARNING: This option is experimental. It can cause conversion to fail. It can also produce unexpected output." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:249 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:249 msgid "Traverse links in HTML files breadth first. Normally, they are traversed depth first." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:256 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:256 msgid "Maximum levels of recursion when following links in HTML files. Must be non-negative. 0 implies that no links in the root HTML file are followed. Default is %default." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:265 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:265 msgid "Normally this input plugin re-arranges all the input files into a standard folder hierarchy. Only use this option if you know what you are doing as it can result in various nasty side effects in the rest of of the conversion pipeline." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/html/input.py:273 +#: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:273 msgid "Average line length for line breaking if the HTML is from a previous partial conversion of a PDF file. Default is %default which disables this." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lit/from_any.py:47 +#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:47 msgid "Creating LIT file from EPUB..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:320 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320 msgid "\tBook Designer file detected." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:322 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:322 msgid "\tParsing HTML..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:345 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:345 msgid "\tBaen file detected. Re-parsing..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:361 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:361 msgid "Written preprocessed HTML to " msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:379 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:379 msgid "Processing %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:393 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:393 msgid "\tConverting to BBeB..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:539 -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:552 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:539 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:552 msgid "Could not parse file: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:544 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:544 msgid "%s is an empty file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:564 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:564 msgid "Failed to parse link %s %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:608 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:608 msgid "Cannot add link %s to TOC" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:957 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:957 msgid "Unable to process image %s. Error: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1002 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1002 msgid "Unable to process interlaced PNG %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1017 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1017 msgid "" "Could not process image: %s\n" "%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1772 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1772 msgid "An error occurred while processing a table: %s. Ignoring table markup." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1774 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1774 msgid "" "Bad table:\n" "%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1796 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1796 msgid "Table has cell that is too large" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1862 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1862 msgid "Could not read cover image: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1865 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865 msgid "Cannot read from: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/html/convert_from.py:1994 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1994 msgid "Failed to process opf file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:136 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:136 msgid "" "%prog book.lrf\n" "Convert an LRF file into an LRS (XML UTF-8 encoded) file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:137 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:137 msgid "Output LRS file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:139 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:139 msgid "Do not save embedded image and font files to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:158 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158 msgid "Parsing LRF..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:161 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:161 msgid "Creating XML..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrfparser.py:163 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:163 msgid "LRS written to " msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:267 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:267 msgid "Could not read from thumbnail file:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:287 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:287 msgid "" "%prog [options] file.lrs\n" "Compile an LRS file into an LRF file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:288 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:288 msgid "Path to output file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:290 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:114 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:290 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:128 msgid "Verbose processing" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/lrs/convert_from.py:292 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:292 msgid "Convert LRS to LRS, useful for debugging." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:457 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:457 msgid "Invalid LRF file. Could not set metadata." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:582 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:582 msgid "" "%prog [options] mybook.lrf\n" "\n" @@ -1764,157 +1778,173 @@ msgid "" "\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/meta.py:603 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:603 msgid "Path to a txt file containing the comment to be stored in the lrf file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:90 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:90 msgid "Enable autorotation of images that are wider than the screen width." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:94 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:94 msgid "Set the space between words in pts. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:97 msgid "Add a header to all the pages with title and author." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:100 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:100 msgid "Set the format of the header. %a is replaced by the author and %t by the title. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:104 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:104 msgid "Add extra spacing below the header. Default is %default pt." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:107 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:107 msgid "Minimum paragraph indent (the indent of the first line of a paragraph) in pts. Default: %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:112 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:112 msgid "Render tables in the HTML as images (useful if the document has large or complex tables)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:117 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:117 msgid "Multiply the size of text in rendered tables by this factor. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:121 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:121 msgid "The serif family of fonts to embed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:124 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:124 msgid "The sans-serif family of fonts to embed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:127 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:127 msgid "The monospace family of fonts to embed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/lrf/output.py:152 +#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/output.py:152 msgid "Comic" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:401 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:45 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:97 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:98 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:65 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:354 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:882 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:589 -msgid "Title" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:402 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:59 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:67 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:359 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:883 -msgid "Author(s)" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:403 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:61 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:72 -msgid "Publisher" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:404 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:49 -msgid "Producer" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:405 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:35 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:210 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:211 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:189 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:99 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:72 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:313 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1081 -msgid "Comments" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:413 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:154 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:27 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:73 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:301 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1077 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:145 -msgid "Tags" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:415 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:152 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:26 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:74 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:318 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1086 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:93 -msgid "Series" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:416 -msgid "Language" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:418 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1069 -msgid "Timestamp" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:420 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:151 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:63 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:70 -msgid "Published" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/__init__.py:422 -msgid "Rights" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/amazon.py:85 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/amazon.py:85 msgid "EDITORIAL REVIEW" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/archive.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:41 msgid "Extract common e-book formats from archives (zip/rar) files. Also try to autodetect if they are actually cbz/cbr files." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:20 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:109 +msgid "TEMPLATE ERROR" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:479 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 +msgid "No" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:479 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 +msgid "Yes" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:550 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:917 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:289 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:589 +msgid "Title" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:551 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:918 +msgid "Author(s)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:552 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72 +msgid "Publisher" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:553 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49 +msgid "Producer" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:554 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:332 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1119 +msgid "Comments" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:556 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:154 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:320 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1115 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:146 +msgid "Tags" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:558 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:337 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1124 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:94 +msgid "Series" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:559 +msgid "Language" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:561 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1107 +msgid "Timestamp" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:563 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:244 +msgid "Published" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:565 +msgid "Rights" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20 msgid "options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:21 msgid "" "\n" "Read/Write metadata from/to ebook files.\n" @@ -1928,155 +1958,155 @@ msgid "" "silently ignored.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:40 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:40 msgid "Set the authors. Multiple authors should be separated by the & character. Author names should be in the order Firstname Lastname." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:44 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:44 msgid "The version of the title to be used for sorting. If unspecified, and the title is specified, it will be auto-generated from the title." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:48 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:48 msgid "String to be used when sorting by author. If unspecified, and the author(s) are specified, it will be auto-generated from the author(s)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:52 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:52 msgid "Set the cover to the specified file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:58 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:58 msgid "Set the book category." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:74 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74 msgid "Set the published date." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:77 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77 msgid "Get the cover from the ebook and save it at as the specified file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:80 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80 msgid "Specify the name of an OPF file. The metadata will be written to the OPF file." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:83 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83 msgid "Read metadata from the specified OPF file and use it to set metadata in the ebook. Metadata specified on the command line will override metadata read from the OPF file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:88 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:88 msgid "Set the BookID in LRF files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:153 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:153 msgid "No file specified" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:168 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:168 msgid "Original metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:185 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185 msgid "Changed metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:197 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:197 msgid "OPF created in" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:203 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:203 msgid "Cover saved to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/cli.py:205 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:205 msgid "No cover found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:28 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:28 msgid "Cover download" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:80 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:80 msgid "Download covers from openlibrary.org" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:108 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:137 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:108 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:137 msgid "ISBN: %s not found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:118 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:118 msgid "Download covers from librarything.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:129 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:68 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:129 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:69 msgid "LibraryThing.com timed out. Try again later." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:136 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:75 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:136 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:76 msgid "Could not fetch cover as server is experiencing high load. Please try again later." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:140 -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:79 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:140 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:80 msgid "LibraryThing.com server error. Try again later." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:226 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:226 msgid "Download covers from Douban.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/covers.py:235 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/covers.py:235 msgid "Douban.com API timed out. Try again later." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/douban.py:42 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/douban.py:42 msgid "Downloads metadata from Douban.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:51 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:51 msgid "Metadata download" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:128 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:128 msgid "ratings" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:128 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:128 msgid "tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:129 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:129 msgid "description/reviews" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:130 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:130 msgid "Download %s from %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:156 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:156 msgid "Downloads metadata from Google Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:173 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:173 msgid "Downloads metadata from isbndb.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:201 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:201 msgid "To use isbndb.com you must sign up for a %sfree account%s and enter your access key below." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:211 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:211 msgid "Downloads social metadata from amazon.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/fetch.py:230 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:230 msgid "Downloads series/tags/rating information from librarything.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:95 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:109 msgid "" "\n" "%prog [options] key\n" @@ -2089,27 +2119,27 @@ msgid "" "\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:106 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:120 msgid "The ISBN ID of the book you want metadata for." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:108 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:122 msgid "The author whose book to search for." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:110 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:124 msgid "The title of the book to search for." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/isbndb.py:112 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:126 msgid "The publisher of the book to search for." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:76 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:77 msgid " not found." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/library_thing.py:86 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:87 msgid "" "\n" "%prog [options] ISBN\n" @@ -2117,186 +2147,186 @@ msgid "" "Fetch a cover image/social metadata for the book identified by ISBN from LibraryThing.com\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/metadata/opf2.py:1227 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1399 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1303 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1399 msgid "Cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:22 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:22 msgid "Modify images to meet Palm device size limitations." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:26 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:26 msgid "When present, use author sort field as author." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:30 msgid "Don't add Table of Contents to end of book. Useful if the book has its own table of contents." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:33 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:33 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:56 msgid "Title for any generated in-line table of contents." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:37 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:37 msgid "Disable compression of the file contents." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:40 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:40 msgid "Tag marking book to be filed with Personal Docs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/output.py:108 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/output.py:108 msgid "All articles" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/mobi/reader.py:259 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:259 msgid "This is an Amazon Topaz book. It cannot be processed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1400 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1400 msgid "Title Page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1401 -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:53 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:199 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1401 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:199 msgid "Table of Contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1402 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1402 msgid "Index" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1403 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1403 msgid "Glossary" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1404 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1404 msgid "Acknowledgements" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1405 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1405 msgid "Bibliography" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1406 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1406 msgid "Colophon" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1407 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1407 msgid "Copyright" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1408 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1408 msgid "Dedication" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1409 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1409 msgid "Epigraph" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1410 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1410 msgid "Foreword" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1411 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1411 msgid "List of Illustrations" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1412 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1412 msgid "List of Tables" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1413 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1413 msgid "Notes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1414 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1414 msgid "Preface" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/base.py:1415 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1415 msgid "Main Text" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/iterator.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/iterator.py:41 msgid "%s format books are not supported" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/cover.py:101 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:156 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/cover.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:156 msgid "Book %s of %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/htmltoc.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:54 msgid "HTML TOC generation options." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/jacket.py:153 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:71 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71 msgid "Rating" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/transforms/split.py:34 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/split.py:34 msgid "Could not find reasonable point at which to split: %s Sub-tree size: %d KB" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:32 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:32 msgid "OPF/NCX/etc. generation options." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:35 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:35 msgid "OPF version to generate. Default is %default." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/oeb/writer.py:37 +#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/writer.py:37 msgid "Generate an Adobe \"page-map\" file if pagination information is available." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:128 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:128 msgid "Footnotes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/ereader/reader132.py:135 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/reader132.py:135 msgid "Sidebar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:22 -#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:23 -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:22 +#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:23 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:24 msgid "Normally calibre treats blank lines as paragraph markers. With this option it will assume that every line represents a paragraph instead." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/input.py:26 -#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/input.py:27 -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:28 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/input.py:26 +#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/input.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:28 msgid "Normally calibre treats blank lines as paragraph markers. With this option it will assume that every line starting with an indent (either a tab or 2+ spaces) represents a paragraph. Paragraphs end when the next line that starts with an indent is reached." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:23 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:23 msgid "Format to use inside the pdb container. Choices are:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdb/output.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdb/output.py:27 msgid "Specify the character encoding of the output document. The default is cp1252. Note: This option is not honored by all formats." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:24 msgid "Do not extract images from the document" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:26 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:26 msgid "Scale used to determine the length at which a line should be unwrapped. Valid values are a decimal between 0 and 1. The default is 0.45, just below the median line length." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/input.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/input.py:30 msgid "Use the new PDF conversion engine." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/cli.py:31 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/cli.py:31 msgid "" "command ...\n" "\n" @@ -2308,113 +2338,113 @@ msgid "" "Manipulate a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:29 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:29 msgid "" "[options] file.pdf\n" "\n" "Crop a PDF file.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:38 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:32 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:34 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:36 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:34 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:33 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:38 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:32 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:34 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:36 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:34 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:33 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:41 msgid "Path to output file. By default a file is created in the current directory." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:41 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:41 msgid "Number of pixels to crop from the left most x (default is %s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:44 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:44 msgid "Number of pixels to crop from the left most y (default is %s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:47 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:47 msgid "Number of pixels to crop from the right most x (default is %s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:50 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:50 msgid "Number of pixels to crop from the right most y (default is %s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:53 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:53 msgid "A file generated by ghostscript which allows each page to be individually cropped `gs -dSAFER -dNOPAUSE -dBATCH -sDEVICE=bbox file.pdf 2> bounding`" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73 msgid "Crop Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/crop.py:73 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53 -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/crop.py:73 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61 msgid "Options to control the transformation of pdf" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:23 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:23 msgid "" "[options] file.pdf password\n" "\n" "Decrypt a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/decrypt.py:60 msgid "Decrypt Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:25 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:25 msgid "" "[options] file.pdf password\n" "\n" "Encrypt a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/encrypt.py:54 msgid "Encrypt Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:21 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:21 msgid "" "file.pdf ...\n" "\n" "Get info about a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:46 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:34 msgid "Author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:47 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47 msgid "Subject" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:48 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:48 msgid "Creator" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:50 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:50 msgid "Pages" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:51 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:51 msgid "File Size" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/info.py:52 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:52 msgid "PDF Version" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:25 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:25 msgid "" "[options] file1.pdf file2.pdf ...\n" "\n" @@ -2423,33 +2453,33 @@ msgid "" "Merges individual PDFs.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/merge.py:56 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/merge.py:56 msgid "Merge Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:25 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:25 msgid "" "[options] file.pdf\n" "\n" "Reverse a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/reverse.py:54 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/reverse.py:54 msgid "Reverse Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:24 msgid "" "file.pdf degrees\n" "\n" "Rotate pages of a PDF clockwise.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/rotate.py:53 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/rotate.py:53 msgid "Rotate Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:25 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:25 msgid "" "\n" "%prog %%name [options] file.pdf page_to_split_on ...\n" @@ -2464,1458 +2494,1475 @@ msgid "" "Split a PDF.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/manipulate/split.py:61 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/split.py:61 msgid "Split Options:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:31 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:31 msgid "The unit of measure. Default is inch. Choices are %s Note: This does not override the unit for margins!" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:36 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:36 msgid "The size of the paper. This size will be overridden when an output profile is used. Default is letter. Choices are %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:40 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:40 msgid "Custom size of the document. Use the form widthxheight EG. `123x321` to specify the width and height. This overrides any specified paper-size." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:45 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:45 msgid "The orientation of the page. Default is portrait. Choices are %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/output.py:49 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/output.py:49 msgid "Preserve the aspect ratio of the cover, instead of stretching it to fill the ull first page of the generated pdf." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pdf/pdftohtml.py:55 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/pdftohtml.py:55 msgid "Could not find pdftohtml, check it is in your PATH" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/pml/output.py:33 +#: /home/kovid/work/calibre/src/calibre/ebooks/pml/output.py:33 msgid "Specify the character encoding of the output document. The default is cp1252." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/rtf/input.py:196 +#: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:196 msgid "" "This RTF file has a feature calibre does not support. Convert it to HTML first and then try it.\n" "%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:23 +#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:23 msgid "Specify the character encoding of the output document. The default is utf-8." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/tcr/output.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/tcr/output.py:27 msgid "Specify the compression level to use. Scale 1 - 10. 1 being the lowest compression but the fastest and 10 being the highest compression but the slowest." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:34 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:34 msgid "Normally extra spaces are condensed into a single space. With this option all spaces will be displayed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:37 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:37 msgid "Run the text input through the markdown pre-processor. To learn more about markdown see" msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/input.py:40 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:40 msgid "Do not insert a Table of Contents into the output text." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:24 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24 msgid "Type of newline to use. Options are %s. Default is 'system'. Use 'old_mac' for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. 'system' will default to the newline type used by this OS." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:30 msgid "Specify the character encoding of the output document. The default is utf-8. Note: This option is not honored by all formats." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:38 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:38 msgid "The maximum number of characters per line. This splits on the first space before the specified value. If no space is found the line will be broken at the space after and will exceed the specified value. Also, there is a minimum of 25 characters. Use 0 to disable line splitting." msgstr "" -#: /home/kovid/work/trunk/src/calibre/ebooks/txt/output.py:45 +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:45 msgid "Force splitting on the max-line-length value when no space is present. Also allows max-line-length to be below the minimum" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:66 msgid "Send file to storage card instead of main memory by default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:68 msgid "Confirm before deleting" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:70 msgid "Main window geometry" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72 msgid "Notify when a new version is available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74 msgid "Use Roman numerals for series number" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76 msgid "Sort tags list by name, popularity, or rating" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78 msgid "Number of covers to show in the cover browsing mode" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80 msgid "Defaults for conversion to LRF" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82 msgid "Options for the LRF ebook viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85 msgid "Formats that are viewed using the internal viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87 msgid "Columns to be displayed in the book list" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88 msgid "Automatically launch content server on application startup" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:89 msgid "Oldest news kept in database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90 msgid "Show system tray icon" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92 msgid "Upload downloaded news to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94 msgid "Delete books from library after uploading to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96 msgid "Show the cover flow in a separate window instead of in the main calibre window" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98 msgid "Disable notifications from the system tray icon" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100 msgid "Default action to perform when send to device button is clicked" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:120 msgid "Maximum number of waiting worker processes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:122 msgid "Download social metadata (tags/rating/etc.)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:124 msgid "Overwrite author and title with new metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:126 msgid "Limit max simultaneous jobs to number of CPUs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:128 msgid "tag browser categories not to display" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:130 msgid "The layout of the user interface" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:132 msgid "Show the average rating per item indication in the tag browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134 msgid "Disable UI animations" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:182 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:479 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:487 msgid "Copied" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:216 msgid "Copy" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:216 msgid "Copy to Clipboard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/__init__.py:462 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:465 msgid "Choose Files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:25 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:25 msgid "Add books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:26 msgid "Add books to the calibre library/device from files on your computer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:27 msgid "A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:33 msgid "Add books from a single directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:35 msgid "Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:39 msgid "Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:43 msgid "Add Empty book. (Book entry with no formats)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:45 msgid "Add from ISBN" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:84 msgid "How many empty books?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:85 msgid "How many empty books should be added?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:143 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:201 msgid "Uploading books to device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:160 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:170 msgid "Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:161 msgid "EPUB Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:162 msgid "LRF Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:163 msgid "HTML Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:164 msgid "LIT Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:165 msgid "MOBI Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:166 msgid "Topaz books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:167 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:167 msgid "Text books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:168 msgid "PDF Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:169 msgid "Comics" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:170 msgid "Archives" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:174 msgid "Supported books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:210 msgid "Merged some books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:211 msgid "Some duplicates were found and merged into the following existing books:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:220 msgid "Failed to read metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:221 msgid "Failed to read metadata from the following" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:240 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:259 msgid "Add to library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:240 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:56 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:28 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:95 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:120 msgid "No book selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:253 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:253 msgid "The following books are virtual and cannot be added to the calibre library:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:259 msgid "No book files found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add_to_library.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:13 msgid "Add books to library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/add_to_library.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add_to_library.py:14 msgid "Add books to your calibre library from the connected device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:20 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:498 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:521 msgid "Fetch annotations (experimental)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:56 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:236 msgid "Use library only" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:57 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:237 msgid "User annotations generated from main library only" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:64 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:30 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:87 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:116 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:76 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:142 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:180 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:208 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92 msgid "No books selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:65 msgid "No books selected to fetch annotations from" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:90 msgid "Merging user annotations into database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:118 msgid "%s<br />Last Page Read: %d (%d%%)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:124 msgid "%s<br />Last Page Read: Location %d (%d%%)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:143 msgid "<b>Location %d • %s</b><br />%s<br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:152 msgid "<b>Page %d • %s</b><br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/annotate.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:157 msgid "<b>Location %d • %s</b><br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:20 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:34 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:34 msgid "Create catalog of books in your calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:31 msgid "No books selected to generate catalog for" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:53 msgid "Generating %s catalog..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:230 msgid "No books found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:59 msgid "" "No books to catalog\n" "Check exclude tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:69 msgid "Catalog generated." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:72 msgid "Export Catalog Directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/catalog.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:73 msgid "Select destination for %s.%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:51 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:51 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112 msgid "%d books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:82 msgid "Choose calibre library to work with" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:91 msgid "Switch/create library..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:99 msgid "Quick switch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:101 msgid "Rename library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:103 msgid "Delete library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:120 +msgid "Library backup status..." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:176 msgid "Rename" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:177 msgid "Choose a new name for the library <b>%s</b>. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:178 msgid "Note that the actual library folder will be renamed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:177 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:185 msgid "Already exists" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:186 msgid "The folder %s already exists. Delete it first." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:192 msgid "Rename failed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:193 msgid "Failed to rename the library at %s. The most common cause for this is if one of the files in the library is open in another program." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:195 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:53 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:102 msgid "Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:196 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:204 msgid "All files from %s will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:223 +msgid "none" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:224 +msgid "Backup status" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:225 +msgid "Book metadata files remaining to be written: %s" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:234 msgid "No library found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:235 msgid "No existing calibre library was found at %s. It will be removed from the list of known libraries." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:249 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:254 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:101 -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:584 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:272 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:587 msgid "Not allowed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:250 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:268 msgid "You cannot change libraries when a device is connected." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/choose_library.py:255 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:273 msgid "You cannot change libraries while jobs are running." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:22 msgid "C" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:22 msgid "Convert books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:28 msgid "Convert individually" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:30 msgid "Bulk convert" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86 msgid "Cannot convert" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/convert.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:115 msgid "Starting conversion of %d book(s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:79 msgid "Copy to library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:80 msgid "Copy selected books to the specified library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:115 msgid "Cannot copy" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:120 msgid "No library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:121 msgid "No library found at %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:124 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:128 msgid "Copying" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 msgid "Could not copy books: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:138 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:670 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:428 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:693 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:675 msgid "Failed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/copy_to_library.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:141 msgid "Copied %d books to %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:18 msgid "Del" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:18 msgid "Remove books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:24 msgid "Remove selected books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:26 msgid "Remove files of a specific format from selected books.." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:29 msgid "Remove all formats from selected books, except..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:32 msgid "Remove covers from selected books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:35 msgid "Remove matching books from device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:53 msgid "Cannot delete" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:66 msgid "Choose formats to be deleted" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:84 msgid "Choose formats <b>not</b> to be deleted" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:104 msgid "Cannot delete books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:105 msgid "No device is connected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:115 msgid "Main memory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:116 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:435 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:444 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:458 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:467 msgid "Storage Card A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:117 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:437 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:446 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:460 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:469 msgid "Storage Card B" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:122 msgid "No books to delete" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:123 msgid "None of the selected books are on the device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:140 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:195 msgid "Deleting books from device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:161 msgid "The selected books will be <b>permanently deleted</b> and the files removed from your calibre library. Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/delete.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:180 msgid "The selected books will be <b>permanently deleted</b> from your device. Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:26 msgid "Connect to folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:31 msgid "Connect to iTunes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:40 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:48 msgid "Start Content Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:50 msgid "Stop Content Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:61 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:67 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:69 msgid "Email to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:69 msgid " and delete from library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:81 msgid "Setup email based sharing of books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:98 msgid "D" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:98 msgid "Send to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/device.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:117 msgid "Connect/share" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_collections.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:13 msgid "Manage collections" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_collections.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_collections.py:14 msgid "Manage the collections on this device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24 msgid "E" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:24 msgid "Edit metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:28 msgid "Merge book records" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:29 msgid "M" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:31 msgid "Edit metadata individually" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:34 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:34 msgid "Edit metadata in bulk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:37 msgid "Download metadata and covers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:40 msgid "Download only metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:42 msgid "Download only covers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:45 msgid "Download only social metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:51 msgid "Merge into first selected book - delete others" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:54 msgid "Merge into first selected book - keep others" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:75 msgid "Cannot download metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:101 msgid "social metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:103 msgid "covers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:103 msgid "metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:108 msgid "Downloading %s for %d book(s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:131 msgid "Failed to download some metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:132 msgid "Failed to download metadata for the following:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:135 msgid "Failed to download metadata:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:131 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:607 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:65 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:112 -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:630 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:125 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54 msgid "Error" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:141 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:146 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:184 msgid "Cannot edit metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:207 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:216 msgid "Cannot merge books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:217 msgid "At least two books must be selected for merging" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:221 msgid "Book formats and metadata from the selected books will be added to the <b>first selected book.</b> ISBN will <i>not</i> be merged.<br><br> The second and subsequently selected books will not be deleted or changed.<br><br>Please confirm you want to proceed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233 msgid "Book formats and metadata from the selected books will be merged into the <b>first selected book</b>. ISBN will <i>not</i> be merged.<br><br>After merger the second and subsequently selected books will be <b>deleted</b>. <br><br>All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently <b>deleted</b> from your computer.<br><br> Are you <b>sure</b> you want to proceed?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/edit_metadata.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:246 msgid "You are about to merge more than 5 books. Are you <b>sure</b> you want to proceed?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:18 msgid "F" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:18 msgid "Fetch news" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:53 msgid "Fetching news from " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/fetch_news.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:67 msgid " fetched." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 msgid "Browse the calibre User Manual" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 msgid "F1" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/help.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/help.py:16 msgid "Help" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/open.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/open.py:14 msgid "Open containing folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/open.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/open.py:15 msgid "O" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:17 msgid "Ctrl+P" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:23 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23 msgid "Run welcome wizard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:33 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:38 msgid "Cannot configure" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:34 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:34 msgid "Cannot configure while there are running jobs." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/preferences.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:39 msgid "Cannot configure before calibre is restarted." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/restart.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/restart.py:14 msgid "&Restart" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/restart.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/restart.py:14 +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:59 msgid "Ctrl+R" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:24 msgid "Save single format to disk..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:40 msgid "S" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:40 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:46 msgid "Save to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:48 msgid "Save to disk in a single directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:50 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:69 msgid "Save only %s format to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:72 msgid "Save only %s format to disk in a single directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:91 msgid "Cannot save to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:94 msgid "Choose destination directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:102 msgid "You are trying to save files into the calibre library. This can cause corruption of your library. Save to disk is meant to export files from your calibre library elsewhere." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:136 msgid "Error while saving" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:137 msgid "There was an error while saving." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:144 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:145 msgid "Could not save some books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/save_to_disk.py:146 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:146 msgid "Click the show details button to see which ones." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:16 msgid "Show book details" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:17 msgid "I" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:26 msgid "No detailed info available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/show_book_details.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:27 msgid "No detailed information is available for books on the device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:17 msgid "Similar books..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:24 msgid "Alt+A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:24 msgid "Books by same author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:25 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:25 msgid "Books in this series" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:26 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:26 msgid "Alt+Shift+S" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:27 msgid "Alt+P" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:27 msgid "Books by this publisher" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:28 msgid "Alt+T" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/similar_books.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/similar_books.py:28 msgid "Books with the same tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:54 msgid "Tweak ePub" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:16 msgid "Make small changes to ePub format books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:17 msgid "T" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:27 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:39 msgid "Cannot tweak ePub" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/tweak_epub.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:40 msgid "No ePub available. First convert the book to ePub." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:24 msgid "V" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:24 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:32 msgid "View" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:33 msgid "View specific format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:95 -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:156 msgid "Cannot view" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:101 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:77 msgid "Choose the format to view" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:109 msgid "Multiple Books Selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:110 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:119 msgid "Cannot open folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/actions/view.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/view.py:157 msgid "%s has no available formats." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:54 msgid "Searching in" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:198 msgid "Adding..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:211 msgid "Searching in all sub-directories..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:224 msgid "Path error" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:225 msgid "The specified directory could not be processed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:228 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:811 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:836 msgid "No books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:294 msgid "Added" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:306 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:307 msgid "Adding failed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:307 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:308 msgid "The add books process seems to have hung. Try restarting calibre and adding the books in smaller increments, until you find the problem book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:322 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:323 msgid "Duplicates found!" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:323 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:324 msgid "Books with the same title as the following already exist in the database. Add them anyway?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:326 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:327 msgid "Adding duplicates..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:390 msgid "Saving..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add.py:446 +#: /home/kovid/work/calibre/src/calibre/gui2/add.py:443 msgid "Saved" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:57 msgid "Searching for sub-folders" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:62 msgid "Searching for books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:74 msgid "Looking for duplicates based on file hash" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:109 -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:70 msgid "Choose root folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:137 msgid "Invalid root folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:138 msgid "is not a valid root folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/__init__.py:148 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/__init__.py:148 msgid "Add books to calibre" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:21 -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:62 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:41 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:41 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:49 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:41 msgid "WizardPage" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:22 msgid "Scanning root folder for books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/scan_ui.py:23 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/scan_ui.py:23 msgid "This may take a few minutes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:63 msgid "Choose the location to add books from" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:64 msgid "Select a folder on your hard disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:65 msgid "" "<p>calibre can scan your computer for existing books automatically. These books will then be <b>copied</b> into the calibre library. This wizard will help you customize the scanning and import process for your existing book collection.</p>\n" "<p>Choose a root folder. Books will be searched for only inside this folder and any sub-folders.</p>\n" "<p>Make sure that the folder you chose for your calibre library <b>is not</b> under the root folder you choose.</p>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:68 msgid "&Root folder:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:69 msgid "This folder and its sub-folders will be scanned for books to import into calibre's library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:71 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:57 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:128 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:176 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:84 -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:85 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:77 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:375 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:382 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:396 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:407 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:409 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:411 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:418 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:92 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:95 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:161 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:164 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:168 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:171 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:131 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:133 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:136 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:140 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:82 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:272 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:274 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:275 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:156 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:157 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:83 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:85 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:87 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:89 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:90 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:83 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:85 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:87 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:89 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:90 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:88 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:103 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:105 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:108 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:110 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:80 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:85 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:191 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:375 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:382 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:396 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:407 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:409 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:411 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:418 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:191 msgid "..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:72 msgid "Handle multiple files per book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:73 msgid "&One book per folder, assumes every ebook file in a folder is the same book in a different format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/add_wizard/welcome_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/add_wizard/welcome_ui.py:74 msgid "&Multiple books per folder, assumes every ebook file is a different book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:23 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:45 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:311 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:114 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:115 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:116 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:126 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:308 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1067 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:23 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:313 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:327 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1105 msgid "Path" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:24 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:48 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:117 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:118 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:119 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info.py:122 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:307 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:326 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:103 msgid "Formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:25 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:886 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1070 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:25 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:921 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108 msgid "Collections" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:47 -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:58 msgid "Click to open" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:48 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:300 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:306 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:312 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1076 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1080 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:47 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:78 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:83 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:319 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:331 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1114 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1118 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:293 msgid "None" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/book_details.py:310 +#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:312 msgid "Click to open Book Details window" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:16 msgid "BibTeX Options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17 msgid "Options specific to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:16 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:20 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:21 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:17 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:18 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:15 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:17 msgid "output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:88 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:48 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:28 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:31 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:122 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:115 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:171 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:66 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:115 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:31 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:35 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:38 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:42 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:28 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:80 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:62 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:46 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:45 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:55 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:67 -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:82 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:35 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:111 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:48 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:136 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/conversion_ui.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:65 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:105 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:63 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:46 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:67 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:61 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:123 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:98 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:49 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:107 msgid "Form" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:82 msgid "Bib file encoding:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83 -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml_ui.py:38 msgid "Fields to include in output:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:84 msgid "ascii/LaTeX" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:85 msgid "Encoding configuration (change if you have errors) :" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:86 msgid "strict" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:87 msgid "replace" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:88 msgid "ignore" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:89 msgid "backslashreplace" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:90 msgid "BibTeX entry type:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:91 msgid "mixed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:92 msgid "misc" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:93 msgid "book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:94 msgid "Create a citation tag?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:95 msgid "Expression to form the BibTeX citation tag:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_bibtex_ui.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_bibtex_ui.py:96 msgid "" "Some explanation about this template:\n" " -The fields availables are 'author_sort', 'authors', 'id',\n" @@ -3926,1694 +3973,1786 @@ msgid "" " -For time field, only the date will be used. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_csv_xml.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_csv_xml.py:16 msgid "CSV/XML Options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:17 msgid "E-book options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:77 msgid "'Don't include this book' tag:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:78 msgid "'Mark this book as read' tag:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:79 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:79 msgid "Additional note tag prefix:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:80 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:80 msgid "Regex pattern describing tags to exclude as genres:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:81 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:81 msgid "" "Regex tips:\n" "- The default regex - \\[.+\\] - excludes genre tags of the form [tag], e.g., [Amazon Freebie]\n" "- A regex pattern of a single dot excludes all genre tags, generating no Genre Section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:84 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:84 msgid "Include 'Titles' Section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:85 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:85 msgid "Include 'Recently Added' Section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:86 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:86 msgid "Sort numbers as text" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:87 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi_ui.py:87 msgid "Include 'Series' Section" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_tab_template_ui.py:28 msgid "Tab template for catalog.ui" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:36 msgid "For settings that cannot be specified in this dialog, use the values saved in a previous conversion (if they exist) instead of using the defaults specified in the Preferences" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:68 msgid "Bulk Convert" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/bulk.py:81 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/bulk.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:185 msgid "Options specific to the output format." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:15 msgid "Comic Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input.py:16 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:13 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:13 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:13 msgid "input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:89 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99 msgid "&Number of Colors:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:90 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:101 msgid "Disable &normalize" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:91 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:102 msgid "Keep &aspect ratio" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:92 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:103 msgid "Disable &Sharpening" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:93 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:109 msgid "Disable &Trimming" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:94 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:108 msgid "&Wide" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:95 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:104 msgid "&Landscape" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:96 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:106 msgid "&Right to left" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:97 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:105 msgid "Don't so&rt" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:98 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:107 msgid "De&speckle" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:99 msgid "&Disable comic processing" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:100 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:120 msgid "&Output format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/comic_input_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/comic_input_ui.py:101 msgid "Disable conversion of images to &black and white" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:19 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:19 msgid "Debug" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:21 msgid "Debug the conversion process." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:39 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:56 msgid "Choose debug folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:58 msgid "Invalid debug directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug.py:59 msgid "Failed to create debug directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:55 msgid "Choose a folder to put the debug output into. If you specify a folder, calibre will place a lot of debug output into it. This will be useful in understanding the conversion process and figuring out the correct values for conversion parameters like Table of Contents and Chapter Detection." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/debug_ui.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:59 msgid "The debug process outputs the intermediate HTML generated at various stages of the conversion process. This HTML can sometimes serve as a good starting point for hand editing a conversion." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15 msgid "EPUB Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:49 msgid "Do not &split on page breaks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:50 msgid "No default &cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:51 msgid "No &SVG cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:52 msgid "Preserve cover &aspect ratio" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:53 msgid "Split files &larger than:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/epub_output_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:54 msgid " KB" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input.py:12 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input.py:12 msgid "FB2 Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_input_ui.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:29 msgid "Do not insert a &Table of Contents at the beginning of the book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output.py:14 msgid "FB2 Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:32 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:37 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output_ui.py:29 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:47 msgid "&Inline TOC" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/fb2_output_ui.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:33 msgid "Sectionize Chapters (Use with care!)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104 msgid "Font rescaling wizard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:105 msgid "" "<p>This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.</p>\n" "<p>By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. </p>\n" "<p>See the <a href=\"http://calibre-ebook.com/user_manual/conversion.html#font-size-rescaling\">User Manual</a> for a discussion of how font size rescaling works.</p>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:108 msgid "&Output document" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:109 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:114 msgid "&Base font size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:110 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:126 msgid "Font size &key:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:111 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:115 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:117 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:125 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:130 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:118 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:120 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:125 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:121 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:123 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:125 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:127 msgid " pt" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:112 msgid "Use &default values" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:113 msgid "&Input document" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:116 msgid "&Font size: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:118 msgid " will map to size: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/font_key_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:119 msgid "0.0 pt" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:16 msgid "Look & Feel" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:18 msgid "Control the look and feel of the output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:31 msgid "Original" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:32 msgid "Left align" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel.py:33 msgid "Justify text" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:123 msgid "&Disable font size rescaling" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:124 msgid "Base &font size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:127 msgid "Wizard to help you choose an appropriate font size key" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:129 msgid "Line &height:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:131 msgid "Input character &encoding:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:132 msgid "Remove &spacing between paragraphs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:133 msgid "Indent size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:134 msgid "<p>When calibre removes inter paragraph spacing, it automatically sets a paragraph indent, to ensure that paragraphs can be easily distinguished. This option controls the width of that indent." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:135 msgid " em" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:136 msgid "Text justification:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137 msgid "&Linearize tables" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:138 msgid "Extra &CSS" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:139 msgid "&Transliterate unicode characters to ASCII" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:140 msgid "Insert &blank line" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:141 msgid "Keep &ligatures" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/look_and_feel_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:142 msgid "Smarten &punctuation" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output.py:19 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output.py:19 msgid "LRF Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:116 msgid "Enable &autorotation of wide images" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:117 msgid "&Wordspace:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:119 msgid "Minimum para. &indent:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:121 msgid "Render &tables as images" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:122 msgid "Text size multiplier for text in rendered tables:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:123 msgid "Add &header" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:124 msgid "Header &separation:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:126 msgid "Header &format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:127 msgid "&Embed fonts" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:128 msgid "&Serif font family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:129 msgid "S&ans-serif font family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/lrf_output_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:130 msgid "&Monospaced font family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:41 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:114 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:200 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:200 msgid "Metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:43 msgid "Set the metadata. The output file will contain as much of this metadata as possible." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:165 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:109 msgid "Choose cover for " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:172 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:116 msgid "Cannot read" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:173 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:117 msgid "You do not have permission to read the file: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:181 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:188 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:125 msgid "Error reading file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:182 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:126 msgid "<p>There was an error reading from file: <br /><b>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata.py:189 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:134 msgid " is not a valid picture" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:172 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:413 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413 msgid "Book Cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:173 msgid "Use cover from &source file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:174 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:414 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:414 msgid "Change &cover image:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:175 msgid "Browse for an image to use as the cover of this book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:177 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:372 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:372 msgid "&Title: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:178 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:373 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:373 msgid "Change the title of this book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:179 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:230 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:376 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:376 msgid "&Author(s): " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:180 msgid "Author So&rt:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:181 msgid "Change the author(s) of this book. Multiple authors should be separated by a comma" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:182 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:239 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:239 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:387 msgid "&Publisher: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:183 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:388 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:388 msgid "Ta&gs: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:184 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:241 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:389 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:389 msgid "Tags categorize the book. This is particularly useful while searching. <br><br>They can be any words or phrases, separated by commas." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:185 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:248 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:392 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:185 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:248 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:392 msgid "&Series:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:186 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:187 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:249 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:250 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:393 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:394 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:249 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:250 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:394 msgid "List of known series. You can add new series." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/metadata_ui.py:188 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:399 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:399 msgid "Book " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:20 msgid "MOBI Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output.py:43 msgid "Default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:67 msgid "&Title for Table of Contents:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:68 msgid "Rescale images for &Palm devices" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:69 msgid "Use author &sort for author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:70 msgid "Disable compression of the file contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:71 msgid "Do not add Table of Contents to book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:72 msgid "Kindle options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:73 msgid "Periodical masthead font:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/mobi_output_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/mobi_output_ui.py:74 msgid "Personal Doc tag:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup.py:35 msgid "Page Setup" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:116 msgid "&Output profile:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:117 msgid "Profile description" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:118 msgid "&Input profile:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:119 msgid "Margins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:120 msgid "&Left:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:122 msgid "&Top:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124 msgid "&Right:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/page_setup_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:126 msgid "&Bottom:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input.py:12 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input.py:12 msgid "PDB Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:32 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47 msgid "Treat each &line as a paragraph" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_input_ui.py:33 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:48 msgid "Assume print formatting" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output.py:16 msgid "PDB Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdb_output_ui.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:36 msgid "&Format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input.py:12 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input.py:12 msgid "PDF Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:39 msgid "Line &Un-Wrapping Factor:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_input_ui.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:40 msgid "No &Images" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output.py:17 msgid "PDF Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:43 msgid "&Paper Size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:44 msgid "&Orientation:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/pdf_output_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:45 msgid "Preserve &aspect ratio of cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/rb_output.py:14 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output.py:14 msgid "RB Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:83 msgid "No formats available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:84 msgid "Cannot build regex using the GUI builder without a book." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:103 msgid "Open book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:52 msgid "Regex Builder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:53 msgid "Preview" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:54 msgid "Regex:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/regex_builder_ui.py:55 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122 msgid "Test" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:171 msgid "Convert" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single.py:196 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:196 msgid "Options specific to the input format." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:117 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:69 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:96 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:53 msgid "Dialog" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:118 msgid "&Input format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/single_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single_ui.py:119 msgid "Use &saved conversion settings for individual books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:17 msgid "" "Structure\n" "Detection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:19 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:19 msgid "Fine tune the detection of chapter headings and other document structure." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:37 msgid "Detect chapters at (XPath expression):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:38 msgid "Insert page breaks before (XPath expression):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:40 msgid "Header regular expression:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:43 msgid "Footer regular expression:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:59 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:87 msgid "Invalid regular expression" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:60 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:88 msgid "Invalid regular expression: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:65 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:39 msgid "Invalid XPath" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection.py:66 -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:40 msgid "The XPath expression %s is invalid." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:81 msgid "Chapter &mark:" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:82 msgid "Remove first &image" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:83 msgid "Insert &metadata as page at start of book" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:84 msgid "Remove F&ooter" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:85 msgid "Remove H&eader" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:86 msgid "Line &un-wrap factor during preprocess:" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/convert/structure_detection_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:87 msgid "&Preprocess input file to possibly improve structure detection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:16 msgid "" "Table of\n" "Contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:18 msgid "Control the creation/conversion of the Table of Contents." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:30 msgid "Level &1 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:31 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:31 msgid "Level &2 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc.py:32 msgid "Level &3 TOC (XPath expression):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63 msgid "Do not add &detected chapters to the Table of Contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64 msgid "Number of &links to add to Table of Contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65 msgid "Chapter &threshold" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66 msgid "&Force use of auto-generated Table of Contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/toc_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67 msgid "TOC &Filter:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input.py:12 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input.py:12 msgid "TXT Input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:49 msgid "Process using markdown" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:50 msgid "<p>Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit <a href=\"http://daringfireball.net/projects/markdown\">markdown</a>." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:51 msgid "Do not insert Table of Contents into output text when using markdown" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_input_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:52 msgid "Preserve &spaces" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16 msgid "TXT Output" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:46 msgid "&Line ending style:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:48 msgid "&Maximum line length:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/txt_output_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:49 msgid "Force maximum line length" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:56 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:70 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:71 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:46 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:62 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:55 msgid "TextLabel" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xexp_edit_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:57 msgid "Use a wizard to help construct the XPath expression" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:68 msgid "Match HTML &tags with tag name:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:69 msgid "*" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:70 msgid "a" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:71 msgid "br" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72 msgid "div" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:73 msgid "h1" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:74 msgid "h2" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:75 msgid "h3" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:76 msgid "h4" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:77 msgid "h5" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:78 msgid "h6" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:79 msgid "hr" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:80 msgid "span" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:81 msgid "Having the &attribute:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:82 msgid "With &value:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:83 msgid "(A regular expression)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/convert/xpath_wizard_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:84 msgid "<p>For example, to match all h2 tags that have class=\"chapter\", set tag to <i>h2</i>, attribute to <i>class</i> and value to <i>chapter</i>.</p><p>Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.</p><p>To learn more advanced usage of XPath see the <a href=\"http://calibre-ebook.com/user_manual/xpath.html\">XPath Tutorial</a>." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/cover_flow.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:118 msgid "Browse by covers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/cover_flow.py:149 +#: /home/kovid/work/calibre/src/calibre/gui2/cover_flow.py:149 msgid "Cover browser could not be loaded" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:84 -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:108 -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:145 -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:164 -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:270 -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:110 -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:130 -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:205 -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:238 -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:242 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:270 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:239 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:243 msgid "Undefined" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:244 -#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:122 -msgid "Yes" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:59 -#: /home/kovid/work/trunk/src/calibre/library/server/mobile.py:246 -#: /home/kovid/work/trunk/src/calibre/library/server/xml.py:124 -msgid "No" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:122 msgid "star(s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:123 msgid "Unrated" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:156 msgid "Set '%s' to today" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:266 msgid " index:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:451 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:257 -msgid "Automatically number books in this series" +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:460 +msgid "Remove series" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:498 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:463 +msgid "Automatically number books" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:466 +msgid "Force numbers to start with " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:529 msgid "Remove all tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:519 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:550 msgid "tags to add" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/custom_column_widgets.py:524 +#: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:555 msgid "tags to remove" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:48 -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:50 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:136 msgid "No details available." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:167 msgid "Device no longer connected." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:285 msgid "Get device information" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:294 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:296 msgid "Get list of books on device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:304 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:306 msgid "Get annotations from device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:313 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:315 msgid "Send metadata to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:318 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:320 msgid "Send collections to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:342 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:365 msgid "Upload %d books to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:357 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:380 msgid "Delete books from device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:374 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:397 msgid "Download books from device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:384 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:407 msgid "View book on device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:418 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:441 msgid "Set default send to device action" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:424 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:447 msgid "Send to main memory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:426 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:449 msgid "Send to storage card A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:428 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:451 msgid "Send to storage card B" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:433 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:442 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:456 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:465 msgid "Main Memory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:453 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:476 msgid "Send and delete from library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:454 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:477 msgid "Send specific format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:490 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:513 msgid "Eject device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:608 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631 msgid "Error communicating with device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:629 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:652 msgid "Select folder to open as device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:676 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699 msgid "Error talking to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:677 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:700 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:720 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:743 msgid "Device: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:722 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:745 msgid " detected." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:812 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:837 msgid "selected to send" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:817 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842 msgid "Choose format to send to device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:826 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:851 msgid "No device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:827 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:852 msgid "Cannot send: No device is connected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:830 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:834 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:855 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:859 msgid "No card" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:831 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:835 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:856 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:860 msgid "Cannot send: Device has no storage card" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:876 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:901 msgid "E-book:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:879 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:904 msgid "Attached, you will find the e-book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:880 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:905 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:107 msgid "by" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:881 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:906 msgid "in the %s format." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:894 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:919 msgid "Sending email to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:924 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:932 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1025 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1087 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1206 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1214 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:949 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:957 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1050 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1112 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239 msgid "No suitable formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:925 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:950 msgid "Auto convert the following books before sending via email?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:933 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:958 msgid "Could not email the following books as no suitable formats were found:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:951 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:976 msgid "Failed to email books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:952 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:977 msgid "Failed to email the following books:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:956 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:981 msgid "Sent by email:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:984 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1009 msgid "News:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:985 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1010 msgid "Attached is the" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:996 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1021 msgid "Sent news to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1026 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1088 -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1207 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1051 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1113 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232 msgid "Auto convert the following books before uploading to the device?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1056 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1081 msgid "Sending catalogs to device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1120 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1145 msgid "Sending news to device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1173 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1198 msgid "Sending books to device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1215 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1277 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1303 msgid "No space on device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/device.py:1278 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1304 msgid "<p>Cannot upload books to device there is no more free space available " msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:324 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:57 +msgid "Invalid template" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:58 +msgid "The template %s is invalid:" +msgstr "" + #: -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:83 msgid "Select available formats and their order for this device" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:87 msgid "Use sub directories" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:88 msgid "Use author sort for author" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/device_drivers/configwidget_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:90 msgid "Save &template:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:48 msgid "Add books by ISBN" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:49 msgid "<p>Enter a list of ISBNs in the box to the left, one per line. calibre will automatically create entries for books based on the ISBN and download metadata and covers for them.<p>Any invalid ISBNs in the list will be ignored." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/add_from_isbn_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn_ui.py:50 msgid "&Paste from clipboard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:73 msgid "Fit &cover within view" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:74 msgid "&Previous" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/book_info_ui.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:75 msgid "&Next" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog.py:38 msgid "My Books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:69 -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:304 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:304 msgid "Generate catalog" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:70 msgid "Generate catalog for {0} books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:71 msgid "Catalog &format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:72 msgid "Catalog &title (existing catalog with the same title will be replaced):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:73 msgid "&Send catalog to device automatically" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/catalog_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:74 msgid "Catalog options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_format_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:45 msgid "Choose Format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:38 msgid "Choose location for calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:45 msgid "Same as current" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:46 msgid "The location %s contains the current calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:51 msgid "No existing library found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:52 msgid "There is no existing calibre library at %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:56 msgid "Not empty" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:57 msgid "The folder %s is not empty. Please choose an empty folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:80 msgid "No location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:80 msgid "No location selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:84 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:620 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:628 msgid "Bad location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library.py:85 msgid "%s is not an existing folder" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:71 msgid "Choose your calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:72 msgid "Your calibre library is currently located at {0}" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:73 msgid "New &Location:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:74 msgid "Use &existing library at the new location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:75 msgid "&Create an empty library at the new location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/choose_library_ui.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_library_ui.py:76 msgid "&Move current library to new location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 msgid "Set defaults for conversion of comics (CBR/CBZ files)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 msgid "Set options for converting %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97 msgid "&Title:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98 msgid "&Author(s):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comicconf_ui.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100 msgid "&Profile:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/comments_dialog_ui.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog_ui.py:41 msgid "Edit Comments" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/confirm_delete_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:55 msgid "&Show this warning again" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/conversion_error_ui.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:47 msgid "ERROR" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:67 msgid "All checked books will be <b>permanently deleted</b> from your device. Please verify the list." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 msgid "Location" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:69 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:884 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:31 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:588 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:919 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:31 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:280 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:588 msgid "Date" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1066 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1104 msgid "Format" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device_ui.py:50 msgid "Delete from device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:34 msgid "Author sort" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:511 +msgid "Invalid author name" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:512 +msgid "Author names cannot contain & characters." +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:66 msgid "Manage authors" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:67 msgid "Sort by author" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:68 msgid "Sort by author sort" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:69 msgid "Reset all the author sort values to a value automatically generated from the author. Exactly how this value is automatically generated can be controlled via Preferences->Advanced->Tweaks" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog_ui.py:70 msgid "Recalculate all author sort values" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:60 msgid "Author Sort" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:62 msgid "ISBN" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:162 msgid "Finding metadata..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:176 msgid "Could not find metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:177 msgid "The metadata download seems to have stalled. Try again later." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:186 msgid "Warning" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:187 msgid "Could not fetch metadata from:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:191 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:191 msgid "No metadata found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata.py:192 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:192 msgid "No metadata found, try adjusting the title and author or the ISBN key." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:90 msgid "Fetch metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:91 msgid "<p>calibre can find metadata for your books from two locations: <b>Google Books</b> and <b>isbndb.com</b>. <p>To use isbndb.com you must sign up for a <a href=\"http://www.isbndb.com\">free account</a> and enter your access key below." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:92 msgid "&Access Key:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:93 msgid "Fetch" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:94 msgid "Matches" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:95 msgid "Select the book that most closely matches your copy from the list below" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:96 msgid "Download &social metadata (tags/rating/etc.) for the selected book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/fetch_metadata_ui.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:97 msgid "Overwrite author and title with author and title of selected book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/job_view_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:42 msgid "Details of job" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:49 msgid "Active Jobs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:50 msgid "&Stop selected job" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:51 msgid "Show job &details" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/jobs_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:52 msgid "Stop &all non device jobs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:107 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:385 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:25 +msgid "Title/Author" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:26 +msgid "Standard metadata" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:27 +msgid "Custom metadata" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:28 +msgid "Search/Replace" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:76 +msgid "Working" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:385 msgid "Lower Case" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:108 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:384 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:384 msgid "Upper Case" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:109 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:387 msgid "Title Case" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:185 +msgid "Character match" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:186 +msgid "Regular Expression" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:189 +msgid "Replace field" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:190 +msgid "Prepend to field" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:191 +msgid "Append to field" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:202 msgid "Editing meta information for <b>%d books</b>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:255 msgid "Book %d:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:182 -msgid "Search and replace in text fields using regular expressions. The search text is an arbitrary python-compatible regular expression. The replacement text can contain backreferences to parenthesized expressions in the pattern. The search is not anchored, and can match and replace multiple times on the same string. See <a href=\"http://docs.python.org/library/re.html\"> this reference</a> for more information, and in particular the 'sub' function." +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:270 +msgid "<b>You can destroy your library using this feature.</b> Changes are permanent. There is no undo function. This feature is experimental, and there may be bugs. You are strongly encouraged to back up your library before proceeding.<p>Search and replace in text fields using character matching or regular expressions. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:192 -msgid "Note: <b>you can destroy your library</b> using this feature. Changes are permanent. There is no undo function. You are strongly encouraged to back up your library before proceeding." +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:279 +msgid "In character mode, the field is searched for the entered search text. The text is replaced by the specified replacement text everywhere it is found in the specified field. After replacement is finished, the text can be changed to upper-case, lower-case, or title-case. If the case-sensitive check box is checked, the search text must match exactly. If it is unchecked, the search text will match both upper- and lower-case letters" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:290 +msgid "In regular expression mode, the search text is an arbitrary python-compatible regular expression. The replacement text can contain backreferences to parenthesized expressions in the pattern. The search is not anchored, and can match and replace multiple times on the same string. The modification functions (lower-case etc) are applied to the matched text, not to the field as a whole. The destination box specifies the field where the result after matching and replacement is to be assigned. You can replace the text in the field, or prepend or append the matched text. See <a href=\"http://docs.python.org/library/re.html\"> this reference</a> for more information on python's regular expressions, and in particular the 'sub' function." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:432 +msgid "You must specify a destination when source is a composite field" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:524 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:532 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:623 msgid "Search/replace invalid" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:525 +msgid "Authors cannot be set to the empty string. Book title %s not processed" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:533 +msgid "Title cannot be set to the empty string. Book title %s not processed" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:624 msgid "Search pattern is invalid: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk.py:419 -msgid "Applying changes to %d books. This may take a while." +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:661 +msgid "" +"Applying changes to %d books.\n" +"Phase {0} {1}%%." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:229 msgid "Edit Meta information" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:231 msgid "A&utomatically set author sort" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:232 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:232 msgid "Author s&ort: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:233 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:233 msgid "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:234 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:383 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:383 msgid "&Rating:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:235 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:236 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:384 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:385 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:384 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:385 msgid "Rating of this book. 0-5 stars" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:237 msgid "No change" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:238 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:238 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:386 msgid " stars" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:240 msgid "Add ta&gs: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:242 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:243 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:390 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:391 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:242 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:243 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:390 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:391 msgid "Open Tag Editor" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:244 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:244 msgid "&Remove tags:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:245 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:245 msgid "Comma separated list of tags to remove from the books. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:246 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:246 msgid "Check this box to remove all tags from the books." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:247 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:247 msgid "Remove all" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:251 msgid "Remove &format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:252 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:252 msgid "&Swap title and author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:253 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:253 msgid "" "Selected books will be automatically numbered,\n" "in the order you selected them.\n" @@ -5621,915 +5760,915 @@ msgid "" "Book A will have series number 1 and Book B series number 2." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:258 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:257 +msgid "Automatically number books in this series" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:258 msgid "" "Remove stored conversion settings for the selected books.\n" "\n" "Future conversion of these books will use the default settings." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:261 msgid "Remove &stored conversion settings for the selected books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:262 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:422 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:262 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:422 msgid "&Basic metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:263 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:423 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:423 msgid "&Custom metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:264 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:264 msgid "Search &field:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:265 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:265 msgid "&Search for:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:266 msgid "&Replace with:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:267 msgid "Apply function &after replace:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:268 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:268 msgid "Test &text" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:269 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:269 msgid "Test re&sult" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:270 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:270 msgid "Your test:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_bulk_ui.py:271 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:271 msgid "&Search and replace (experimental)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:91 msgid "Last modified: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:133 msgid "Not a valid picture" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:150 msgid "Specify title and author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:151 msgid "You must specify a title and author before generating a cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:169 msgid "Choose formats for " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:200 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:200 msgid "No permission" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:201 msgid "You do not have permission to read the following files:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:228 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:229 msgid "No format selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:240 msgid "Could not read metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:241 msgid "Could not read metadata from %s format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:289 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:295 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:289 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:295 msgid "Could not read cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:290 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:290 msgid "Could not read cover from %s format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:296 msgid "The cover in the %s format is invalid" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:351 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:351 msgid " The green color indicates that the current author sort matches the current author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:354 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:354 msgid " The red color indicates that the current author sort does not match the current author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:359 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:359 msgid "Abort the editing of all remaining books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:524 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:529 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:524 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:529 msgid "This ISBN number is valid" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:532 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:532 msgid "This ISBN number is invalid" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:611 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:611 msgid "Cannot use tag editor" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:612 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:612 msgid "The tags editor cannot be used if you have modified the tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:632 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:632 msgid "Downloading cover..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:644 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:649 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:655 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:660 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:644 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:649 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:655 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:660 msgid "Cannot fetch cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:645 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:656 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:661 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:645 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:656 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:661 msgid "<b>Could not fetch cover.</b><br/>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:646 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:646 msgid "The download timed out." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:650 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:650 msgid "Could not find cover for this book. Try specifying the ISBN first." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:662 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:662 msgid "For the error message from each cover source, click Show details below." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:669 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:669 msgid "Bad cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:670 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:670 msgid "The cover is not a valid picture" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:703 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:703 msgid "There were errors" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:704 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:704 msgid "There were errors downloading social metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:733 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:733 msgid "Cannot fetch metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:734 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734 msgid "You must specify at least one of ISBN, Title, Authors or Publisher" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:820 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:820 msgid "Permission denied" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single.py:821 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:821 msgid "Could not open %s. Is it being used by another program?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:370 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:370 msgid "Edit Meta Information" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:371 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:371 msgid "Meta information" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:374 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:374 msgid "Swap the author and title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:377 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:377 msgid "Author S&ort: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:378 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:378 msgid "" "Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles.\n" "If the box is colored green, then text matches the individual author's sort strings. If it is colored red, then the authors and this text do not match." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:380 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380 msgid "" "Automatically create the author sort entry based on the current author entry.\n" "Using this button to create author sort will change author sort from red to green." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:395 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:395 msgid "Remove unused series (Series that have no books)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:397 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:397 msgid "IS&BN:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:398 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:398 msgid "Publishe&d:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:401 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:401 msgid "dd MMM yyyy" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:402 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:402 msgid "&Date:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:403 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:403 msgid "&Comments" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:404 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:404 msgid "&Fetch metadata from server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:405 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:405 msgid "Available Formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:406 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:406 msgid "Add a new format for this book to the database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:408 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:408 msgid "Remove the selected formats for this book from the database." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:410 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:410 msgid "Set the cover for the book from the selected format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:412 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:412 msgid "Update metadata from the metadata in the selected format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:415 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:415 msgid "&Browse" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:416 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:416 msgid "Remove border (if any) from cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:417 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:417 msgid "Reset cover to default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:419 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:419 msgid "Download co&ver" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:420 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:420 msgid "Generate a default cover based on the title and author" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/metadata_single_ui.py:421 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:421 msgid "&Generate cover" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:61 msgid "Password needed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:63 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:217 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:125 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:117 msgid "&Username:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:64 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:218 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:126 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:119 msgid "&Password:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/password_ui.py:65 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:219 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:130 msgid "&Show password" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress.py:59 msgid "Aborting..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/progress.py:76 -msgid "Working" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor.py:54 msgid "The current saved search will be <b>permanently deleted</b>. Are you sure?" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:88 msgid "Saved Search Editor" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:89 msgid "Saved Search: " msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:90 msgid "Select a saved search to edit" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:91 msgid "Delete this selected saved search" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:93 msgid "Enter a new saved search name." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:94 msgid "Add the new saved search" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/saved_search_editor_ui.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/saved_search_editor_ui.py:96 msgid "Change the contents of the saved search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:124 msgid "Need username and password" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:125 msgid "You must provide a username and/or password to use this news source." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:176 msgid "Created by: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:183 msgid "Last downloaded: never" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:198 msgid "%d days, %d hours and %d minutes ago" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:196 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:200 msgid "Last downloaded" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:220 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:197 msgid "Schedule news download" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:227 msgid "Add a custom news source" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232 msgid "Download all scheduled new sources" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:328 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:332 msgid "No internet connection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler.py:329 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:333 msgid "Cannot download news as no internet connection is active" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:198 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:278 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:198 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:278 msgid "Recipes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:199 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:199 msgid "Download all scheduled recipes at once" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:200 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:200 msgid "Download &all scheduled" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:201 msgid "blurb" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:202 msgid "&Schedule for download:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:203 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:213 msgid "Every " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:204 msgid "day" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:205 msgid "Monday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:206 msgid "Tuesday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:207 msgid "Wednesday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:208 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:208 msgid "Thursday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:209 msgid "Friday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:210 msgid "Saturday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:211 msgid "Sunday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:212 msgid "at" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:214 msgid "Interval at which to download this recipe. A value of zero means that the recipe will be downloaded every hour." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:215 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:227 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:268 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268 msgid " days" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:216 msgid "&Account" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:220 msgid "For the scheduling to work, you must leave calibre running." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:221 msgid "&Schedule" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:222 msgid "Add &title as tag" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:223 msgid "&Extra tags:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:224 msgid "&Advanced" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:225 msgid "&Download now" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:226 msgid "Delete downloaded news older than the specified number of days. Set to zero to disable." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/scheduler_ui.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:228 msgid "Delete downloaded news older than " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36 msgid "contains" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37 msgid "The text to search for. It is interpreted as a regular expression." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38 msgid "<p>Negate this match. That is, only return results that <b>do not</b> match this query." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_item_ui.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39 msgid "Negate" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:118 msgid "Advanced Search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:119 msgid "Find entries that have..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:120 msgid "&All these words:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:121 msgid "This exact &phrase:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:122 msgid "&One or more of these words:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:123 msgid "But dont show entries that have..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:124 msgid "Any of these &unwanted words:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:125 msgid "What kind of match to use:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:126 msgid "Contains: the word or phrase matches anywhere in the metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:127 msgid "Equals: the word or phrase must match an entire metadata field" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:128 msgid "Regular expression: the expression must match anywhere in the metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:129 msgid " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/search_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:130 msgid "See the <a href=\"http://calibre-ebook.com/user_manual/gui.html#the-search-interface\">User Manual</a> for more help" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/select_formats.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/select_formats.py:45 msgid "Choose formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:83 msgid "Authors" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:50 -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:50 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114 msgid "Publishers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:114 msgid " (not on any book)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:166 msgid "The current tag category will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:158 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:158 msgid "User Categories Editor" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:159 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:159 msgid "A&vailable items" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:160 msgid "Apply tags to current tag category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:162 msgid "A&pplied items" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:163 msgid "Unapply (remove) tag from current tag category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:165 msgid "Category name: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:166 msgid "Select a category to edit" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:167 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:167 msgid "Delete this selected tag category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:169 msgid "Enter a new category name. Select the kind before adding it." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:170 msgid "Add the new category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:172 msgid "Category filter: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_categories_ui.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories_ui.py:173 msgid "Select the content kind of the new category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor.py:68 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:105 msgid "Are your sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor.py:69 msgid "The following tags are used by one or more books. Are you certain you want to delete them?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128 msgid "Tag Editor" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129 msgid "A&vailable tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130 msgid "Delete tag from database. This will unapply the tag from all books and then remove it from the database." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132 msgid "Apply tag to current book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134 msgid "A&pplied tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135 msgid "Unapply (remove) tag from current book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:137 msgid "&Add tag:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:138 msgid "If the tag you want is not in the available list, you can add it here. Accepts a comma separated list of tags." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_editor_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:139 msgid "Add tag to available tags and apply it to current book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:20 msgid "%s (was %s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:74 -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:501 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:501 msgid "Item is blank" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:75 -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:502 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:502 msgid "An item cannot be set to nothing. Delete it instead." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:91 msgid "No item selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:92 msgid "You must select one item from the list of Available items." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:101 msgid "No items selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:102 msgid "You must select at least one items from the list." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:106 msgid "Are you certain you want to delete the following items?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:77 msgid "Category Editor" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 msgid "Items in use" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:79 msgid "Delete item from database. This will unapply the item from all books and then remove it from the database." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:81 msgid "Rename the item in every book where it is used." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tag_list_editor_ui.py:83 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:106 msgid "Ctrl+S" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:56 msgid "Test email settings" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:57 msgid "Send test mail from %s to:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/test_email_ui.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120 msgid "&Test" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:55 msgid "Display contents of exploded ePub" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:56 msgid "&Explode ePub" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:57 msgid "Rebuild ePub from exploded contents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:58 msgid "&Rebuild ePub" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:59 msgid "Discard changes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:60 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:218 msgid "&Cancel" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/tweak_epub_ui.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:61 msgid "Explode the ePub to display contents in a file browser window. To tweak individual files, right-click, then 'Open with...' your editor of choice. When tweaks are complete, close the file browser window. Rebuild the ePub, updating your calibre library." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:127 msgid "No recipe selected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:132 msgid "The attached file: %s is a recipe to download %s." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:133 msgid "Recipe for " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:150 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:161 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:260 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260 msgid "Switch to Advanced mode" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:156 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164 msgid "Switch to Basic mode" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:174 msgid "Feed must have a title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:175 msgid "The feed must have a title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179 msgid "Feed must have a URL" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180 msgid "The feed %s must have a URL" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:186 msgid "This feed has already been added to the recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:227 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:236 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:286 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:286 msgid "Invalid input" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:228 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:237 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:287 msgid "<p>Could not create recipe. Error:<br>%s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:241 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:263 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:290 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:290 msgid "Replace recipe?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:242 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:264 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:291 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:242 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:264 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:291 msgid "A custom recipe named %s already exists. Do you want to replace it?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257 msgid "Pick recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:257 msgid "Pick the recipe to customize" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles.py:277 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:277 msgid "Choose a recipe file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:253 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:253 msgid "Add custom news source" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:254 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:254 msgid "Available user recipes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:255 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:255 msgid "Add/Update &recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:256 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:256 msgid "&Remove recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:257 msgid "&Share recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:258 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:258 msgid "Customize &builtin recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:259 msgid "&Load recipe from file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261 msgid "" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" @@ -6537,60 +6676,60 @@ msgid "" "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news recipe, by adding RSS feeds to it. <br />For most feeds, you will have to use the \"Advanced mode\" to further customize the fetch process.</p></body></html>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:265 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 msgid "Recipe &title:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 msgid "&Oldest article:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267 msgid "The oldest article to download" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:269 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269 msgid "&Max. number of articles per feed:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:270 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270 msgid "Maximum number of articles to download per feed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:271 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271 msgid "Feeds in recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273 msgid "Remove feed from recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:276 -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:279 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 msgid "Add feed to recipe" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:277 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277 msgid "&Feed title:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:278 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:278 msgid "Feed &URL:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:280 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:280 msgid "&Add feed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:281 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:281 msgid "For help with writing advanced news recipes, please visit <a href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/dialogs/user_profiles_ui.py:282 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:282 msgid "Recipe source code (python)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" @@ -6601,562 +6740,565 @@ msgid "" "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" font-weight:600;\">Test</span> functionality below to test your regular expression on a few sample filenames. The group names for the various metadata entries are documented in tooltips.</p></body></html>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119 msgid "Regular &expression" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121 msgid "File &name:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123 msgid "Title:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124 msgid "Regular expression (?P<title>)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:125 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:128 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:131 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:134 -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:137 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:94 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:98 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:103 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:108 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:110 msgid "No match" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126 msgid "Authors:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127 msgid "Regular expression (?P<author>)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129 msgid "Series:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130 msgid "Regular expression (?P<series>)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132 msgid "Series index:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133 msgid "Regular expression (?P<series_index>)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135 msgid "ISBN:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/filename_pattern_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136 msgid "Regular expression (?P<isbn>)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:100 msgid "Cover Browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:105 msgid "Shift+Alt+B" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:119 msgid "Tag Browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:121 msgid "Shift+Alt+T" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:141 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:29 msgid "version" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:142 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:30 msgid "created by Kovid Goyal" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:160 msgid "Connected " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:172 msgid "Update found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:207 -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:217 msgid "Book Details" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:209 msgid "Alt+D" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/init.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/init.py:219 msgid "Shift+Alt+D" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:61 msgid "Job" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:62 msgid "Status" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:63 msgid "Progress" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:64 msgid "Running time" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:76 msgid "There are %d running jobs:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:80 -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:87 -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:102 msgid "Unknown job" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:83 msgid "There are %d waiting jobs:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:219 -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:222 msgid "Cannot kill job" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:220 msgid "Cannot kill jobs that communicate with the device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:223 msgid "Job has already run" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:251 msgid "Unavailable" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:283 msgid "Jobs:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:285 msgid "Shift+Alt+J" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:302 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:302 msgid "Click to see list of jobs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/jobs.py:371 +#: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:371 msgid " - Jobs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:53 msgid "Eject this device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:62 -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:62 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:209 msgid "Library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:63 msgid "Show books in calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:64 msgid "Device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:65 msgid "Show books in the main memory of the device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:66 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:655 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:66 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:839 msgid "Card A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67 msgid "Show books in storage card A" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:68 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:657 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:68 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:841 msgid "Card B" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:69 msgid "Show books in storage card B" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:109 msgid "available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:140 msgid "Books display will be restricted to those matching the selected saved search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:153 msgid "Advanced search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:155 msgid "&Search:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:162 msgid "<p>Search the list of books by title, author, publisher, tags, comments, etc.<br><br>Words separated by spaces are ANDed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:169 msgid "Reset Quick Search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:181 msgid "Copy current search text (instead of search name)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:187 msgid "Save current search under the name shown in the box" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/layout.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:193 msgid "Delete current saved search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:284 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:285 msgid "N" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/delegates.py:284 +#: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:285 msgid "Y" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:226 msgid "On Device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271 msgid "Size (MB)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:319 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1086 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:338 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1124 msgid "Book <font face=\"serif\">%s</font> of %s." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:674 -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1184 -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:401 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:697 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1222 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:401 msgid "The lookup/search name is \"{0}\"" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:881 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:916 msgid "In Library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:885 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:920 msgid "Size" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1164 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202 msgid "Marked for deletion" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/models.py:1167 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205 msgid "Double click to <b>edit</b> me<br><br>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:115 msgid "Hide column %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:120 msgid "Sort on %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:121 msgid "Ascending" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:124 msgid "Descending" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:136 msgid "Change text alignment for %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:138 msgid "Left" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:138 msgid "Right" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:139 msgid "Center" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:158 msgid "Show column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:170 msgid "Restore default layout" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/library/views.py:585 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:588 msgid "Dropping onto a device is not supported. First add the book to the calibre library." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:52 msgid "Configure Viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:53 msgid "Use white background" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:54 msgid "Hyphenate" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/config_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:55 msgid "<b>Changes will only take effect after a restart.</b>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:70 msgid " - LRF Viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main.py:160 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:433 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:433 msgid "No matches found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133 msgid "LRF Viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134 msgid "Parsing LRF file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135 msgid "LRF Viewer toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:136 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:477 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:477 msgid "Next Page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:137 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:478 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:478 msgid "Previous Page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:138 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193 msgid "Back" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:139 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:194 msgid "Forward" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:140 msgid "Next match" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:141 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:201 msgid "Open ebook" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/lrf_renderer/main_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:142 msgid "Configure" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:30 msgid "Use the library located at the specified path." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:32 msgid "Start minimized to system tray." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:34 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:34 msgid "Log debugging information to console" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:36 msgid "Do not check for updates" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:58 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:628 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:636 msgid "Calibre Library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:86 msgid "Choose a location for your calibre e-book library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:95 msgid "Failed to create library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:96 msgid "Failed to create calibre library at: %r." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:99 -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184 msgid "Choose a location for your new calibre e-book library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:153 msgid "Initializing user interface..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:178 msgid "Repairing failed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179 msgid "The database repair failed. Starting with a new empty library." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:193 -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:226 msgid "Bad database location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:194 msgid "Bad database location %r. calibre will now quit." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207 msgid "Corrupted database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:208 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208 msgid "Your calibre database appears to be corrupted. Do you want calibre to try and repair it automatically? If you say No, a new empty calibre library will be created." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:214 msgid "Repairing database. This can take a very long time for a large collection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:227 msgid "Bad database location %r. Will start with a new, empty calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:238 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:237 msgid "Starting %s: Loading books..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:282 msgid "If you are sure it is not running" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:284 msgid "Cannot Start " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:286 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:285 msgid "%s is already running." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:289 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:288 msgid "may be running in the system tray, in the" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:291 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:290 msgid "upper right region of the screen." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:292 msgid "lower right region of the screen." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:295 msgid "try rebooting your computer." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:298 -#: /home/kovid/work/trunk/src/calibre/gui2/main.py:310 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:297 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:309 msgid "try deleting the file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:20 +#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:20 msgid "Redirect console output to a dialog window (both stdout and stderr). Useful on windows where GUI apps do not have a output streams." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:61 msgid "&Preferences" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:62 msgid "&Quit" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/main_window.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:90 +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:109 msgid "ERROR: Unhandled exception" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:94 msgid "Book has neither title nor ISBN" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/metadata.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata.py:120 msgid "No matches found for this book" msgstr "" -#: /home/kovid/work/trunk/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." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:49 msgid "Here you can control how calibre will read metadata from the files you add to it. calibre can either read metadata from the contents of the file, or from the filename." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:50 msgid "Read metadata from &file contents rather than file name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:51 msgid "" "If an existing book with a similar title and author is found that does not have the format being added, the format is added\n" "to the existing book, instead of creating a new entry. If the existing book already has the format, then it is silently ignored.\n" @@ -7164,277 +7306,287 @@ msgid "" "Title match ignores leading indefinite articles (\"the\", \"a\", \"an\"), punctuation, case, etc. Author match is exact." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:55 msgid "If books with similar titles and authors found, &merge the new files automatically" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:56 msgid "&Configure metadata from file name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:57 msgid "Swap the firstname and lastname of the author. This affects only metadata read from file names." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/adding_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:58 msgid "&Swap author firstname and lastname" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:145 msgid "Normal" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:146 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:146 msgid "High" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:32 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:147 msgid "Low" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:162 msgid "Done" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior.py:163 msgid "Confirmation dialogs have all been reset" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:137 msgid "&Overwrite author and title by default when fetching metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:138 msgid "Download &social metadata (tags/ratings/etc.) by default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:139 msgid "Show notification when &new version is available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:140 msgid "Automatically send downloaded &news to ebook reader" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:141 msgid "&Delete news from library when it is automatically sent to reader" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:142 msgid "Default network &timeout:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:143 msgid "Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:144 msgid " seconds" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:148 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:148 msgid "Job &priority:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:149 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:149 msgid "Preferred &output format:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:150 msgid "Restriction to apply when the current library is opened:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:151 msgid "Apply this restriction on calibre startup if the current library is being used. Also applied when switching to this library. Note that this setting is per library. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:152 msgid "A comma-separated list of tags that will be applied to books added to the library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:153 msgid "Tags to apply when adding a book:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:154 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:154 msgid "Reset all disabled &confirmation dialogs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:155 msgid "Preferred &input format order:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/behavior_ui.py:158 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:158 msgid "Use internal &viewer for:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:96 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:96 msgid "You must select a column to delete it" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:101 msgid "The selected column is not a custom column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:103 msgid "Do you really want to delete column %s and all its data?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:82 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:82 msgid "Here you can re-arrange the layout of the columns in the calibre library book list. You can hide columns by unchecking them. You can also create your own, custom columns." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:84 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:84 msgid "Remove a user-defined column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:86 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:86 msgid "Add a user-defined column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:88 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:88 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:88 msgid "Edit settings of a user-defined column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/columns_ui.py:91 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/custom_columns_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:91 msgid "Add &custom column" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/conversion.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion.py:37 msgid "Restore settings to default values. Only settings for the currently selected section are restored." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:19 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:19 msgid "Text, column shown in the tag browser" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:22 msgid "Comma separated text, like tags, shown in the tag browser" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:25 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:25 msgid "Long text, like comments, not shown in the tag browser" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:28 msgid "Text column for keeping series-like information" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:33 msgid "Floating point numbers" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:35 msgid "Integers" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:37 msgid "Ratings, shown with stars" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:40 msgid "Yes/No" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:42 +msgid "Column built from other columns" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71 msgid "No column selected" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:72 msgid "No column has been selected" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:76 msgid "Selected column is not a user-defined column" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:111 msgid "No lookup name was provided" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:113 msgid "The lookup name must contain only lower case letters, digits and underscores, and start with a letter" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:116 msgid "Lookup names cannot end with _index, because these names are reserved for the index of a series column." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:126 msgid "No column heading was provided" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:133 msgid "The lookup name %s is already used" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:145 msgid "The heading %s is already used" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:106 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:156 +msgid "You must enter a template for composite columns" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:122 msgid "Create or edit custom columns" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:107 msgid "&Lookup name" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:108 msgid "Column &heading" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:109 msgid "Used for searching the column. Must contain only digits and lower case letters." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:110 msgid "Column heading in the library view and category name in the tag browser" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:111 msgid "Column &type" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:112 msgid "What kind of information will be kept in the column." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:113 msgid "" "<p>Date format. Use 1-4 'd's for day, 1-4 'M's for month, and 2 or 4 'y's for year.</p>\n" "<p>For example:\n" @@ -7445,1647 +7597,1672 @@ msgid "" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:119 msgid "Use MMM yyyy for month + year, yyyy for year only" msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:120 msgid "Default: dd MMM yyyy." msgstr "" #: -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/create_custom_column_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column_ui.py:121 msgid "Format for &dates" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:21 msgid "Getting debug information" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:22 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:22 msgid "Copy to &clipboard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/device_debug.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:24 msgid "Debug device detection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:66 msgid "calibre can send your books to you (or your reader) by email. Emails will be automatically sent for downloaded news to all email addresses that have Auto-send checked." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:67 msgid "Add an email address to which to send books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:68 msgid "&Add email" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:69 msgid "Make &default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/email_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:70 msgid "&Remove email" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 msgid "Auto send" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 msgid "Email" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29 msgid "Formats to email. The first matching format will be sent." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30 msgid "If checked, downloaded news will be automatically mailed <br>to this email address (provided it is in one of the listed formats)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/emailp.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104 msgid "new email address" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:24 msgid "Narrow" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:24 msgid "Wide" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:51 msgid "Medium" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:51 msgid "Small" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52 msgid "Large" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:55 msgid "Always" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:55 msgid "Automatic" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56 msgid "Never" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:106 msgid "User Interface &layout (needs restart):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:107 msgid "&Number of covers to show in browse mode (needs restart):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:108 msgid "Choose &language (requires restart):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:109 msgid "Show &average ratings in the tags browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:110 msgid "Disable all animations. Useful if you have a slow/old computer." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:111 msgid "Disable &animations" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:112 msgid "Enable system &tray icon (needs restart)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:113 msgid "Show &splash screen at startup" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:114 msgid "Disable ¬ifications in system tray" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:115 msgid "Use &Roman numerals for series" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:116 msgid "Show cover &browser in a separate window (needs restart)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:117 msgid "Search as you type" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:118 msgid "&Toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:119 msgid "&Icon size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:120 msgid "Show &text under icons:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/look_feel_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:121 msgid "&Split the toolbar into two toolbars" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:215 msgid "&Apply" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:222 msgid "Restore &defaults" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223 msgid "Save changes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:224 msgid "Cancel and return to overview" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:259 msgid "Restoring to defaults not supported for" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:294 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:294 msgid "Some of the changes you made require a restart. Please restart calibre as soon as possible." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:297 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:297 msgid "The changes you have made require calibre be restarted immediately. You will not be allowed set any more preferences, until you restart." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/main.py:302 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:120 msgid "Restart needed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:49 msgid "Checking database integrity" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:66 msgid "Failed to check database integrity" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:71 msgid "Some inconsistencies found" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:72 msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:99 +msgid "Backup metadata" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:100 +msgid "Metadata will be backed up while calibre is running, at the rate of 30 books per minute." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:126 msgid "Failed to install command line tools." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:129 msgid "Command line tools installed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:130 msgid "Command line tools installed in" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:131 msgid "If you move calibre.app, you have to re-install the command line tools." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:64 msgid "&Maximum number of waiting worker processes (needs restart):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:65 msgid "Limit the max. simultaneous jobs to the available CPU &cores" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:66 msgid "Debug &device detection" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:67 msgid "&Check database integrity" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:68 msgid "Open calibre &configuration directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/misc_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:69 msgid "&Install command line tools" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:200 +msgid "That format and device already has a plugboard or conflicts with another plugboard." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:233 +msgid "Invalid destination" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard.py:234 +msgid "The destination field cannot be blank" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:100 msgid "%(plugin_type)s %(plugins)s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:101 msgid "plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:110 msgid "" "\n" "Customization: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:155 msgid "No valid plugin path" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:156 msgid "%s is not a valid plugin path" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:159 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:159 msgid "Choose plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:171 msgid "Plugin cannot be disabled" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:172 msgid "The plugin: %s cannot be disabled" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:182 msgid "Plugin not customizable" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:183 msgid "Plugin: %s does not need customization" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:193 msgid "Customize" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:232 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:236 msgid "Cannot remove builtin plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins.py:233 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:237 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:82 msgid "Here you can customize the behavior of Calibre by controlling what plugins it uses." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:83 msgid "Enable/&Disable plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:84 msgid "&Customize plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:85 msgid "&Remove plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86 msgid "Add new plugin" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:87 msgid "Plugin &file:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/plugins_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:89 msgid "&Add" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template.py:51 -msgid "Invalid template" +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:33 +msgid "Any custom field" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template.py:52 -msgid "The template %s is invalid:" +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template.py:34 +msgid "The lookup name of any custom field. These names begin with \"#\")" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:47 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:47 msgid "Save &template" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:48 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:48 msgid "By adjusting the template below, you can control what folders the files are saved in and what filenames they are given. You can use the / character to indicate sub-folders. Available metadata variables are described below. If a particular book does not have some metadata, the variable will be replaced by the empty string." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/save_template_ui.py:49 +#: +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/save_template_ui.py:49 msgid "Available variables:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:68 msgid "Here you can control how calibre will save your books when you click the Save to Disk button:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:69 msgid "Save &cover separately" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:70 msgid "Replace space with &underscores" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:71 msgid "Update &metadata in saved copies" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:72 msgid "Change paths to &lowercase" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:73 msgid "Format &dates as:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:74 msgid "File &formats to save:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:75 msgid "Convert non-English characters to &English equivalents" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/saving_ui.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/saving_ui.py:76 msgid "Save metadata in &OPF file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:25 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:28 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:63 msgid "Manual management" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:26 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:64 msgid "Only on send" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending.py:27 -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:65 msgid "Automatic management" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:62 msgid "Metadata &management:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:66 msgid "" "<li><b>Manual management</b>: Calibre updates the metadata and adds collections only when a book is sent. With this option, calibre will never remove a collection.</li>\n" "<li><b>Only on send</b>: Calibre updates metadata and adds/removes collections for a book only when it is sent to the device. </li>\n" "<li><b>Automatic management</b>: Calibre automatically keeps metadata on the device in sync with the calibre library, on every connect</li></ul>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/sending_ui.py:69 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/sending_ui.py:69 msgid "Here you can control how calibre will save your books when you click the Send to Device button. This setting can be overriden for individual devices by customizing the device interface plugins in Preferences->Advanced->Plugins" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:75 -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:320 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:320 msgid "Failed to start content server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:99 msgid "Error log:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:106 msgid "Access log:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:121 msgid "You need to restart the server for changes to take effect" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:124 msgid "Server &port:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:127 msgid "If you leave the password blank, anyone will be able to access your book collection using the web interface." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:128 msgid "The maximum size (widthxheight) for displayed covers. Larger covers are resized. " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:129 msgid "Max. &cover size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:131 msgid "Max. &OPDS items per query:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:132 msgid "Max. OPDS &ungrouped items:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:133 msgid "Restriction (saved search) to apply:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:134 msgid "This restriction (based on a saved search) will restrict the books the content server makes available to those matching the search. This setting is per library (i.e. you can have a different restriction per library)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:135 msgid "&Start Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:136 msgid "St&op Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:137 msgid "&Test Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:138 msgid "calibre contains a network server that allows you to access your book collection using a browser from anywhere in the world. Any changes to the settings will only take effect after a server restart." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:139 msgid "Run server &automatically on startup" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:140 msgid "View &server logs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/server_ui.py:141 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/server_ui.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:46 msgid "" "<p>Remember to leave calibre running as the server only runs as long as calibre is running.\n" "<p>Stanza should see your calibre collection automatically. If not, try adding the URL http://myhostname:8080 as a new catalog in the Stanza reader on your iPhone. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/social.py:34 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/social.py:34 msgid "Downloading social metadata, please wait..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:36 msgid "Switch between library and device views" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:39 msgid "Separator" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:52 msgid "Choose library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:202 msgid "The main toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:203 msgid "The main toolbar when a device is connected" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:204 msgid "The context menu for the books in the calibre library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:206 msgid "The context menu for the books on the device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:240 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:240 msgid "Cannot add" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:241 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:241 msgid "Cannot add the actions %s to this location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:259 msgid "Cannot remove" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar.py:260 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:260 msgid "Cannot remove the actions %s from this location" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:99 msgid "Customize the actions in:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:100 msgid "A&vailable actions" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:101 msgid "&Current actions" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:102 msgid "Move selected action up" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:104 msgid "Move selected action down" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:107 msgid "Add selected actions to toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/toolbar_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:109 msgid "Remove selected actions from toolbar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:43 msgid "Invalid tweaks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:44 msgid "The tweaks you entered are invalid, try resetting the tweaks to default and changing them one by one until you find the invalid setting." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:50 msgid "Values for the tweaks are shown below. Edit them to change the behavior of calibre. Your changes will only take effect after a restart of calibre." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:51 msgid "All available tweaks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/preferences/tweaks_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:52 msgid "&Current tweaks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:95 -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:261 -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:573 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:573 msgid "Search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:313 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:313 msgid "The selected search will be <b>permanently deleted</b>. Are you sure?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:355 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:355 msgid "Search (For Advanced Search click the button to the left)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:397 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:397 msgid "Saved Searches" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_box.py:405 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:405 msgid "Choose saved search or enter name for new saved search" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:10 +#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:10 msgid "Restrict to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:16 -#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:16 +#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:65 msgid "(all books)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:59 msgid "({0} of {1})" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/search_restriction_mixin.py:67 +#: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:67 msgid "({0} of all)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:58 msgid "Press a key..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:79 msgid "Already assigned" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:81 msgid "already assigned to" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:131 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223 msgid " or " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:133 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:74 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:74 msgid "&Default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:135 msgid "Customize shortcuts for" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:223 msgid "Keys" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:225 msgid "Double click to change" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:73 msgid "Frame" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:75 msgid "&Custom" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:76 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:76 msgid "&Shortcut:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:77 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:82 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:82 msgid "Click to change" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:79 -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:84 msgid "Clear" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/shortcuts_ui.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:81 msgid "&Alternate shortcut:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:193 msgid "Rename '%s'" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:197 msgid "Edit sort for '%s'" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:202 msgid "Hide category %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:205 msgid "Show category" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:209 msgid "Show all categories" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:216 -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:220 msgid "Manage %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:223 msgid "Manage Saved Searches" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:230 -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:234 msgid "Manage User Categories" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:433 -#: /home/kovid/work/trunk/src/calibre/library/database2.py:304 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:317 msgid "Searches" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:511 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:516 msgid "Duplicate search name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:512 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:517 msgid "The saved search name %s is already used." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:769 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:774 msgid "Sort by name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:769 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:774 msgid "Sort by popularity" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:770 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:775 msgid "Sort by average rating" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:773 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:778 msgid "Set the sort order for entries in the Tag Browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:779 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784 msgid "Match all" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:779 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784 msgid "Match any" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:784 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:789 msgid "When selecting multiple entries in the Tag Browser match any or all of them" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:788 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:793 msgid "Manage &user categories" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tag_view.py:791 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796 msgid "Add your own categories to the Tag Browser" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:64 -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183 msgid "Convert book %d of %d (%s)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:91 -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203 msgid "Could not convert some books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:92 -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204 msgid "Could not convert %d of %d books, because no suitable source format was found." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121 msgid "Queueing books for bulk conversion" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182 msgid "Queueing " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:246 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:246 msgid "Fetch news from " msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:316 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:316 msgid "Convert existing" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/tools.py:317 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:317 msgid "The following books have already been converted to %s format. Do you wish to reconvert them?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:168 msgid "&Restore" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:170 msgid "&Donate to support calibre" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:174 msgid "&Eject connected device" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:216 msgid "Calibre Quick Start Guide" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:418 -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:446 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:428 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:456 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:419 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:429 msgid "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must first remove the DRM using third party tools." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:432 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:442 msgid "Recipe Disabled" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:447 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:457 msgid "<b>Failed</b>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:483 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:493 msgid "is the result of the efforts of many volunteers from all over the world. If you find it useful, please consider donating to support its development. Your donation helps keep calibre development going." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:509 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:519 msgid "There are active jobs. Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:512 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:522 msgid "" " is communicating with the device!<br>\n" " Quitting may cause corruption on the device.<br>\n" " Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:516 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:526 msgid "WARNING: Active jobs" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/ui.py:584 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:604 msgid "will keep running in the system tray. To close it, choose <b>Quit</b> in the context menu of the system tray." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/update.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:56 msgid "Update available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/update.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/update.py:57 msgid "%s has been updated to version %s. See the <a href=\"http://calibre-ebook.com/whats-new\">new features</a>. Visit the download page?" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43 msgid "Edit bookmark" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:43 msgid "New title for bookmark:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:52 msgid "Export Bookmarks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:54 msgid "Saved Bookmarks (*.pickle)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62 msgid "Import Bookmarks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:62 msgid "Pickled Bookmarks (*.pickle)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:89 msgid "Name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:56 msgid "Bookmark Manager" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:57 msgid "Actions" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:58 msgid "Edit" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:59 msgid "Delete" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:60 msgid "Reset" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:61 msgid "Export" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager_ui.py:62 msgid "Import" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:159 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:159 msgid "Configure Ebook viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:160 msgid "&Font options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:161 msgid "Se&rif family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:162 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:162 msgid "&Sans family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:163 msgid "&Monospace family:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:164 msgid "&Default font size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:165 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:167 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:173 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:167 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:173 msgid " px" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:166 msgid "Monospace &font size:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:168 msgid "S&tandard font:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:169 msgid "Serif" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:170 msgid "Sans-serif" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:171 msgid "Monospace" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:172 msgid "Remember last used &window size" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:174 msgid "Maximum &view width:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:175 msgid "H&yphenate (break line in the middle of large words)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:176 msgid "The default language to use for hyphenation rules. If the book does not specify a language, this will be used." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:177 msgid "Default &language for hyphenation:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:178 msgid "&Resize images larger than the viewer window (needs restart)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:179 msgid "&User stylesheet" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:180 msgid "&General" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:181 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:181 msgid "Double click to change a keyboard shortcut" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/config_ui.py:182 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:182 msgid "&Keyboard shortcuts" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/dictionary.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53 msgid "No results found for:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:35 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:35 msgid "Options to customize the ebook viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:42 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:687 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:687 msgid "Remember last used window size" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:44 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:81 msgid "Set the user CSS stylesheet. This can be used to customize the look of all books." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:46 msgid "Maximum width of the viewer window, in pixels." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:48 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:48 msgid "Resize images larger than the viewer window to fit inside it" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:49 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49 msgid "Hyphenate text" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:51 msgid "Default language for hyphenation rules" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:53 msgid "Font options" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:55 msgid "The serif font family" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:57 msgid "The sans-serif font family" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59 msgid "The monospaced font family" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60 msgid "The standard font size in px" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61 msgid "The monospaced font size in px" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62 msgid "The standard font type" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:453 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:453 msgid "&Lookup in dictionary" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:456 -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:456 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:138 msgid "Go to..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:468 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:468 msgid "Next Section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:469 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:469 msgid "Previous Section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:471 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:471 msgid "Document Start" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:472 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:472 msgid "Document End" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:474 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:474 msgid "Section Start" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/documentview.py:475 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:475 msgid "Section End" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:12 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12 msgid "Scroll to the next page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:15 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:15 msgid "Scroll to the previous page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:18 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:18 msgid "Scroll to the next section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:21 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:21 msgid "Scroll to the previous section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:24 msgid "Scroll to the bottom of the section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:27 msgid "Scroll to the top of the section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:30 msgid "Scroll to the end of the document" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:33 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:33 msgid "Scroll to the start of the document" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:36 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:36 msgid "Scroll down" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:39 msgid "Scroll up" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:42 msgid "Scroll left" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/keys.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:45 msgid "Scroll right" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:115 msgid "Book format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:186 msgid "Position in book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:193 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:193 msgid "Go to a reference. To get reference numbers, use the reference mode." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:201 msgid "Search for text in book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:270 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:270 msgid "Print Preview" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:301 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:301 msgid "Connecting to dict.org to lookup: <b>%s</b>…" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:400 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:400 msgid "Choose ebook" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:401 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:401 msgid "Ebooks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:434 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:434 msgid "No matches found for: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:471 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:471 msgid "Loading flow..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:507 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507 msgid "Laying out %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:538 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538 msgid "Bookmark #%d" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:542 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:542 msgid "Add bookmark" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:543 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:543 msgid "Enter title for bookmark:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:553 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:553 msgid "Manage Bookmarks" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:590 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:590 msgid "Loading ebook..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:598 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:598 msgid "DRM Error" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:599 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:599 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:603 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:603 msgid "Could not open ebook" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:677 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677 msgid "Options to control the ebook viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:684 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:684 msgid "If specified, viewer window will try to come to the front when started." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:689 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:689 msgid "Print javascript alert and console messages to the console" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main.py:695 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:695 msgid "" "%prog [options] file\n" "\n" "View an ebook.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:189 msgid "E-book Viewer" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:190 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:190 msgid "Close dictionary" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:192 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:192 msgid "toolBar" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:195 msgid "Next page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:196 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:196 msgid "Previous page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:197 msgid "Font size larger" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:198 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:198 msgid "Font size smaller" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:202 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:202 msgid "Find next" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:203 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:203 msgid "Find next occurrence" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204 msgid "F3" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205 msgid "Copy to clipboard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207 msgid "Reference Mode" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:208 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:208 msgid "Bookmark" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:209 msgid "Toggle full screen" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:210 msgid "Print" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:211 msgid "Find previous" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:212 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:212 msgid "Find previous occurrence" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/main_ui.py:213 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213 msgid "Shift+F3" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/viewer/printing.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:114 msgid "Print eBook" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:257 msgid "Copy Image" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:258 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:258 msgid "Paste Image" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:383 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:383 msgid "Change Case" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:386 msgid "Swap Case" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:857 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:857 msgid "Drag to resize" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:892 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:892 msgid "Show" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:899 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:899 msgid "Hide" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/widgets.py:936 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:936 msgid "Toggle" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:370 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:378 msgid "If you use the WordPlayer e-book app on your Android phone, you can access your calibre book collection directly on the device. To do this you have to turn on the content server." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:374 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:382 msgid "Remember to leave calibre running as the server only runs as long as calibre is running." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:376 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:384 msgid "You have to add the URL http://myhostname:8080 as your calibre library in WordPlayer. Here myhostname should be the fully qualified hostname or the IP address of the computer calibre is running on." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:453 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:461 msgid "Moving library..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:469 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:470 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478 msgid "Failed to move library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:524 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:532 msgid "Invalid database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:525 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:533 msgid "<p>An invalid library already exists at %s, delete it before trying to move the existing library.<br>Error: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:536 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:544 msgid "Could not move library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:607 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:615 msgid "Select location for books" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:621 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:629 msgid "You must choose an empty folder for the calibre library. %s is not empty." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/__init__.py:695 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:703 msgid "welcome wizard" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:53 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:54 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:42 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:42 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:50 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:50 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:42 msgid "Welcome to calibre" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:55 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:43 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:43 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:51 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:43 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:51 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:43 msgid "The one stop solution to all your e-book needs." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:56 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:56 msgid "Choose your book reader. This will set the conversion options to produce books optimized for your device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:57 msgid "&Manufacturers" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/device_ui.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/device_ui.py:58 msgid "&Devices" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:44 msgid "<h2>Congratulations!</h2> You have successfully setup calibre. Press the %s button to apply your settings." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:45 msgid "<h2>Demo videos</h2>Videos demonstrating the various features of calibre are available <a href=\"http://calibre-ebook.com/demo\">online</a>." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/finish_ui.py:46 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/finish_ui.py:46 msgid "<h2>User Manual</h2>A User Manual is also available <a href=\"http://calibre-ebook.com/user_manual\">online</a>." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:44 msgid "<p>calibre can automatically send books by email to your Kindle. To do that you have to setup email delivery below. The easiest way is to setup a free <a href=\"http://gmail.com\">gmail account</a> and click the Use gmail button below. You will also have to register your gmail address in your Amazon account." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/kindle_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:45 msgid "&Kindle email:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:52 msgid "Choose your &language:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:53 msgid "Choose a location for your books. When you add books to calibre, they will be copied here:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:54 msgid "&Change" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/library_ui.py:55 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:55 msgid "If you have an existing calibre library, it will be copied to the new location. If a calibre library already exists at the new location, calibre will switch to using it." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:32 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:32 msgid "Using: %s:%s@%s:%s and %s encryption" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:37 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:37 msgid "Sending..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:42 msgid "Mail successfully sent" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:124 msgid "Finish gmail setup" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:125 msgid "Dont forget to enter your gmail username and password. You can sign up for a free gmail account at http://gmail.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:133 -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:140 msgid "Bad configuration" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:134 msgid "You must set the From email address" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:141 msgid "You must set the username and password for the mail server." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:108 msgid "Send email &from:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:109 msgid "<p>This is what will be present in the From: field of emails sent by calibre.<br> Set it to your email address" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:110 msgid "<p>A mail server is useful if the service you are sending mail to only accepts email from well know mail services." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:111 msgid "Mail &Server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:112 msgid "calibre can <b>optionally</b> use a server to send mail" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:113 msgid "&Hostname:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:114 msgid "The hostname of your mail server. For e.g. smtp.gmail.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:115 msgid "&Port:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:116 msgid "The port your mail server listens for connections on. The default is 25" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:118 msgid "Your username on the mail server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:120 msgid "Your password on the mail server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:121 msgid "&Show" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:122 msgid "&Encryption:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:123 msgid "Use TLS encryption when connecting to the mail server. This is the most common." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124 msgid "&TLS" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125 msgid "Use SSL encryption when connecting to the mail server." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126 msgid "&SSL" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:127 msgid "Use Gmail" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/send_email_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128 msgid "&Test email" msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:44 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:44 msgid "<p>If you use the <a href=\"http://www.lexcycle.com/download\">Stanza</a> e-book app on your iPhone/iTouch, you can access your calibre book collection directly on the device. To do this you have to turn on the calibre content server." msgstr "" -#: /home/kovid/work/trunk/src/calibre/gui2/wizard/stanza_ui.py:45 +#: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:45 msgid "Turn on the &content server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:234 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:365 msgid "today" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:237 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:368 msgid "yesterday" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:240 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:371 msgid "thismonth" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:243 -#: /home/kovid/work/trunk/src/calibre/library/caches.py:244 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:374 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:375 msgid "daysago" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:408 -#: /home/kovid/work/trunk/src/calibre/library/caches.py:418 -msgid "no" -msgstr "" - -#: /home/kovid/work/trunk/src/calibre/library/caches.py:408 -#: /home/kovid/work/trunk/src/calibre/library/caches.py:418 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:539 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:549 msgid "unchecked" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:411 -#: /home/kovid/work/trunk/src/calibre/library/caches.py:421 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:539 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:549 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:175 +msgid "no" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/library/caches.py:542 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:552 msgid "checked" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:411 -#: /home/kovid/work/trunk/src/calibre/library/caches.py:421 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:542 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:552 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:175 msgid "yes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:415 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:546 msgid "blank" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/caches.py:415 +#: /home/kovid/work/calibre/src/calibre/library/caches.py:546 msgid "empty" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:48 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:48 msgid "" "The fields to output when cataloging books in the database. Should be a comma-separated list of fields.\n" "Available fields: %s.\n" @@ -9093,7 +9270,7 @@ msgid "" "Applies to: CSV, XML output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:58 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:58 msgid "" "Output field to sort on.\n" "Available fields: author_sort, id, rating, size, timestamp, title.\n" @@ -9101,7 +9278,7 @@ msgid "" "Applies to: CSV, XML output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:212 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:212 msgid "" "The fields to output when cataloging books in the database. Should be a comma-separated list of fields.\n" "Available fields: %s.\n" @@ -9109,7 +9286,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:222 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:222 msgid "" "Output field to sort on.\n" "Available fields: author_sort, id, rating, size, timestamp, title.\n" @@ -9117,7 +9294,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:231 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:231 msgid "" "Create a citation for BibTeX entries.\n" "Boolean value: True, False\n" @@ -9125,7 +9302,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:240 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:240 msgid "" "The template for citation creation from database fields.\n" " Should be a template with {} enclosed fields.\n" @@ -9134,7 +9311,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:250 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:250 msgid "" "BibTeX file encoding output.\n" "Available types: utf8, cp1252, ascii.\n" @@ -9142,7 +9319,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:259 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:259 msgid "" "BibTeX file encoding flag.\n" "Available types: strict, replace, ignore, backslashreplace.\n" @@ -9150,7 +9327,7 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:268 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:268 msgid "" "Entry type for BibTeX catalog.\n" "Available types: book, misc, mixed.\n" @@ -9158,28 +9335,28 @@ msgid "" "Applies to: BIBTEX output format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:536 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:536 msgid "" "Title of generated catalog used as title in metadata.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:543 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:543 msgid "" "Save the output from different stages of the conversion pipeline to the specified directory. Useful if you are unsure at which stage of the conversion process a bug is occurring.\n" "Default: '%default'None\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:553 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:553 msgid "" "Regex describing tags to exclude as genres.\n" "Default: '%default' excludes bracketed tags, e.g. '[<tag>]'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:559 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:559 msgid "" "Comma-separated list of tag words indicating book should be excluded from output. Case-insensitive.\n" "--exclude-tags=skip will match 'skip this book' and 'Skip will like this'.\n" @@ -9187,35 +9364,35 @@ msgid "" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:567 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:567 msgid "" "Include 'Titles' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:574 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:574 msgid "" "Include 'Series' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:581 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:581 msgid "" "Include 'Recently Added' section in catalog.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:588 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:588 msgid "" "Tag prefix for user notes, e.g. '*Jeff might enjoy reading this'.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:595 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:595 msgid "" "Sort titles with leading numbers as text, e.g.,\n" "'2001: A Space Odyssey' sorts as \n" @@ -9224,78 +9401,78 @@ msgid "" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:602 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:602 msgid "" "Specifies the output profile. In some cases, an output profile is required to optimize the catalog for the device. For example, 'kindle' or 'kindle_dx' creates a structured Table of Contents with Sections and Articles.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/catalog.py:609 +#: /home/kovid/work/calibre/src/calibre/library/catalog.py:609 msgid "" "Tag indicating book has been read.\n" "Default: '%default'\n" "Applies to: ePub, MOBI output formats" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:41 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:43 msgid "Path to the calibre library. Default is to use the path stored in the settings." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:120 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:122 msgid "" "%prog list [options]\n" "\n" "List the books available in the calibre database.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:128 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:130 msgid "" "The fields to display when listing books in the database. Should be a comma separated list of fields.\n" "Available fields: %s\n" "Default: %%default. The special field \"all\" can be used to select all fields. Only has effect in the text output format." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:135 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:137 msgid "" "The field by which to sort the results.\n" "Available fields: %s\n" "Default: %%default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:137 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:139 msgid "Sort results in ascending order" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:139 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:141 msgid "Filter the results by the search query. For the format of the search query, please see the search related documentation in the User Manual. Default is to do no filtering." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:141 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:143 msgid "The maximum width of a single line in the output. Defaults to detecting screen size." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:142 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:144 msgid "The string used to separate fields. Default is a space." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:143 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:145 msgid "The prefix for all file paths. Default is the absolute path to the library folder." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:165 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:167 msgid "Invalid fields. Available fields:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:172 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:174 msgid "Invalid sort field. Available fields:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:244 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:246 msgid "The following books were not added as they already exist in the database (see --duplicates option):" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:267 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:270 msgid "" "%prog add [options] file1 file2 file3 ...\n" "\n" @@ -9303,65 +9480,65 @@ msgid "" "the directory related options below.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:276 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:279 msgid "Assume that each directory has only a single logical book and that all files in it are different e-book formats of that book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:278 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:281 msgid "Process directories recursively" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:280 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:283 msgid "Add books to database even if they already exist. Comparison is done based on book titles." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:282 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:285 msgid "Add an empty book (a book with no formats)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:284 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:287 msgid "Set the title of the added empty book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:286 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:289 msgid "Set the authors of the added empty book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:288 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:291 msgid "Set the ISBN of the added empty book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:313 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:317 msgid "You must specify at least one file to add" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:330 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:334 msgid "" "%prog remove ids\n" "\n" "Remove the books identified by ids from the database. ids should be a comma separated list of id numbers (you can get id numbers by using the list command). For example, 23,34,57-85\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:345 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:349 msgid "You must specify at least one book to remove" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:364 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:368 msgid "" "%prog add_format [options] id ebook_file\n" "\n" "Add the ebook in ebook_file to the available formats for the logical book identified by id. You can get id by using the list command. If the format already exists, it is replaced.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:379 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:383 msgid "You must specify an id and an ebook file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:384 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:388 msgid "ebook file must have an extension" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:392 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:396 msgid "" "\n" "%prog remove_format [options] id fmt\n" @@ -9369,11 +9546,11 @@ msgid "" "Remove the format fmt from the logical book identified by id. You can get id by using the list command. fmt should be a file extension like LRF or TXT or EPUB. If the logical book does not have fmt available, do nothing.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:409 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:413 msgid "You must specify an id and a format" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:427 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:431 msgid "" "\n" "%prog show_metadata [options] id\n" @@ -9382,15 +9559,15 @@ msgid "" "id is an id number from the list command.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:435 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:439 msgid "Print metadata in OPF form (XML)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:444 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:448 msgid "You must specify an id" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:458 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:463 msgid "" "\n" "%prog set_metadata [options] id /path/to/metadata.opf\n" @@ -9401,11 +9578,11 @@ msgid "" "show_metadata command.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:474 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:479 msgid "You must specify an id and a metadata file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:494 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:499 msgid "" "%prog export [options] ids\n" "\n" @@ -9414,27 +9591,27 @@ msgid "" "an opf file). You can get id numbers from the list command.\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:502 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:507 msgid "Export all books in database, ignoring the list of ids." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:504 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:509 msgid "Export books to the specified directory. Default is" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:506 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:511 msgid "Export all books into a single directory" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:513 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:518 msgid "Specifying this switch will turn this behavior off." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:536 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:541 msgid "You must specify some ids or the %s option" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:549 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:554 msgid "" "%prog add_custom_column [options] label name datatype\n" "\n" @@ -9443,19 +9620,19 @@ msgid "" "datatype is one of: {0}\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:558 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:563 msgid "This column stores tag like data (i.e. multiple comma separated values). Only applies if datatype is text." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:562 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:567 msgid "A dictionary of options to customize how the data in this column will be interpreted." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:575 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:580 msgid "You must specify label, name and datatype" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:636 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:641 msgid "" "\n" " %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]\n" @@ -9465,29 +9642,29 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:650 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:655 msgid "" "Comma-separated list of database IDs to catalog.\n" "If declared, --search is ignored.\n" "Default: all" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:654 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:659 msgid "" "Filter the results by the search query. For the format of the search query, please see the search-related documentation in the User Manual.\n" "Default: no filtering" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:660 -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:505 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:665 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:505 msgid "Show detailed output information. Useful for debugging" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:673 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:678 msgid "Error: You must specify a catalog output file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:722 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:727 msgid "" "\n" " %prog set_custom [options] column id value\n" @@ -9499,15 +9676,15 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:733 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:738 msgid "If the column stores multiple values, append the specified values to the existing ones, instead of replacing them." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:744 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:749 msgid "Error: You must specify a field name, id and value" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:763 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:768 msgid "" "\n" " %prog custom_columns [options]\n" @@ -9516,19 +9693,19 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:770 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:775 msgid "Show details for each column." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:782 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:787 msgid "You will lose all data in the column: %r. Are you sure (y/n)? " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:784 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:789 msgid "y" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:790 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:795 msgid "" "\n" " %prog remove_custom_column [options] label\n" @@ -9538,15 +9715,15 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:798 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:803 msgid "Do not ask for confirmation" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:808 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:813 msgid "Error: You must specify a column label" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:818 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:823 msgid "" "\n" " %prog saved_searches [options] list\n" @@ -9559,39 +9736,53 @@ msgid "" " " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:836 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:841 msgid "Error: You must specify an action (add|remove|list)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:844 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:849 msgid "Name:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:845 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:850 msgid "Search string:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:851 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:856 msgid "Error: You must specify a name and a search string" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:854 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:859 msgid "added" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:859 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:864 msgid "Error: You must specify a name" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:862 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:867 msgid "removed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:866 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:871 msgid "Error: Action %s not recognized, must be one of: (add|remove|list)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/cli.py:880 +#: /home/kovid/work/calibre/src/calibre/library/cli.py:884 +msgid "" +"\n" +" %prog restore_database [options]\n" +"\n" +" Restore this database from the metadata stored in OPF\n" +" files in each directory of the calibre library. This is\n" +" useful if your metadata.db file has been corrupted.\n" +"\n" +" WARNING: This completely regenrates your datbase. You will\n" +" lose stored per-book conversion settings and custom recipes.\n" +" " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/library/cli.py:937 msgid "" "%%prog command [options] [arguments]\n" "\n" @@ -9603,622 +9794,671 @@ msgid "" "For help on an individual command: %%prog command --help\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/custom_columns.py:537 +#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:544 msgid "No label was provided" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/custom_columns.py:539 +#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:546 msgid "The label must contain only lower case letters, digits and underscores, and start with a letter" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:71 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:81 msgid "%sAverage rating is %3.1f" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:653 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:837 msgid "Main" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2004 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2261 msgid "<p>Migrating old database to ebook library in %s<br><center>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2033 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2290 msgid "Copying <b>%s</b>" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2050 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2307 msgid "Compacting database" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2143 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2400 msgid "Checking SQL integrity..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2182 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2439 msgid "Checking for missing files." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/database2.py:2204 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2461 msgid "Checked id" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/field_metadata.py:124 +#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:125 msgid "Ratings" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:24 +#: /home/kovid/work/calibre/src/calibre/library/restore.py:117 +msgid "Processed" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/library/restore.py:182 +msgid "creating custom column " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:31 msgid "The title" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:25 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:32 msgid "The authors" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:26 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:33 msgid "The author sort string. To use only the first letter of the name use {author_sort[0]}" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:28 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:35 msgid "The tags" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:29 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:36 msgid "The series" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:30 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:37 msgid "The series number. To get leading zeros use {series_index:0>3s} or {series_index:>3s} for leading spaces" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:33 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:40 msgid "The rating" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:34 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:41 msgid "The ISBN" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:35 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:42 msgid "The publisher" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:36 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:43 msgid "The date" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:37 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:44 msgid "The published date" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:38 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:45 msgid "The calibre internal id" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:48 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:55 msgid "Options to control saving to disk" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:54 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:61 msgid "Normally, calibre will update the metadata in the saved files from what is in the calibre library. Makes saving to disk slower." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:57 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:64 msgid "Normally, calibre will write the metadata into a separate OPF file along with the actual e-book files." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:60 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:67 msgid "Normally, calibre will save the cover in a separate file along with the actual e-book file(s)." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:63 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:70 msgid "Comma separated list of formats to save for each book. By default all available formats are saved." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:66 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:73 msgid "The template to control the filename and directory structure of the saved files. Default is \"%s\" which will save books into a per-author subdirectory with filenames containing title and author. Available controls are: {%s}" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:71 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:78 msgid "The template to control the filename and directory structure of files sent to the device. Default is \"%s\" which will save books into a per-author directory with filenames containing title and author. Available controls are: {%s}" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:78 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:85 msgid "Normally, calibre will convert all non English characters into English equivalents for the file names. WARNING: If you turn this off, you may experience errors when saving, depending on how well the filesystem you are saving to supports unicode." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:84 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:91 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:94 msgid "The format in which to display dates. %d - day, %b - month, %Y - year. Default is: %b, %Y" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:87 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:97 msgid "Convert paths to lowercase." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:89 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:99 msgid "Replace whitespace with underscores." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/save_to_disk.py:263 +#: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:319 msgid "Requested formats not available" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:21 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:21 msgid "Settings to control the calibre content server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:25 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:25 msgid "The port on which to listen. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:27 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:27 msgid "The server timeout in seconds. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:29 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:29 msgid "The max number of worker threads to use. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:31 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:31 msgid "Set a password to restrict access. By default access is unrestricted." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:33 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:33 msgid "Username for access. By default, it is: %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:37 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:37 msgid "The maximum size for displayed covers. Default is %default." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:39 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:39 msgid "The maximum number of matches to return per OPDS query. This affects Stanza, WordPlayer, etc. integration." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/__init__.py:43 +#: /home/kovid/work/calibre/src/calibre/library/server/__init__.py:43 msgid "Group items in categories such as author/tags by first letter when there are more than this number of items. Default: %default. Set to a large number to disable grouping." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/base.py:94 +#: /home/kovid/work/calibre/src/calibre/library/server/base.py:94 msgid "Password to access your calibre library. Username is " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/main.py:28 +#: /home/kovid/work/calibre/src/calibre/library/server/main.py:28 msgid "" "[options]\n" "\n" "Start the calibre content server." msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/main.py:30 +#: /home/kovid/work/calibre/src/calibre/library/server/main.py:30 msgid "Path to the library folder to serve with the content server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/main.py:32 +#: /home/kovid/work/calibre/src/calibre/library/server/main.py:32 msgid "Write process PID to the specified file" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/main.py:36 +#: /home/kovid/work/calibre/src/calibre/library/server/main.py:36 msgid "Specifies a restriction to be used for this invocation. This option overrides any per-library settings specified in the GUI" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:111 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:112 msgid "%d book" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:130 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:131 msgid "%d items" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:147 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:149 msgid "RATING: %s<br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:150 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:152 msgid "TAGS: %s<br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:154 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:157 msgid "SERIES: %s [%s]<br />" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:249 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:248 msgid "Books in your library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:255 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:254 msgid "By " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:256 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:255 msgid "Books sorted by " msgstr "" -#: /home/kovid/work/trunk/src/calibre/library/server/opds.py:588 +#: /home/kovid/work/calibre/src/calibre/library/server/opds.py:588 msgid "Newest" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:32 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:32 msgid "" "%sUsage%s: %s\n" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:76 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:76 msgid "Created by " msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:77 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:77 msgid "Whenever you pass arguments to %prog that have spaces in them, enclose the arguments in quotation marks." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:697 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:697 msgid "Path to the database in which books are stored" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:699 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:699 msgid "Pattern to guess metadata from filenames" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:701 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:701 msgid "Access key for isbndb.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:703 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:703 msgid "Default timeout for network operations (seconds)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:705 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:705 msgid "Path to directory in which your library of books is stored" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:707 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:707 msgid "The language in which to display the user interface" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:709 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:709 msgid "The default output format for ebook conversions." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:713 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:713 msgid "Ordered list of formats to prefer for input." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:715 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:715 msgid "Read metadata from files" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:717 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:717 msgid "The priority of worker processes" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:719 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:719 msgid "Swap author first and last names when reading metadata" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:721 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:721 msgid "Add new formats to existing book records" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:723 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:723 msgid "Tags to apply to books added to the library" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:727 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:727 msgid "List of named saved searches" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:728 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:728 msgid "User-created tag browser categories" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/config.py:730 +#: /home/kovid/work/calibre/src/calibre/utils/config.py:730 msgid "How and when calibre updates metadata on the device." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:43 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:43 msgid "Waiting..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:52 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:52 msgid "Stopped" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:54 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54 msgid "Finished" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/ipc/job.py:76 +#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:76 msgid "Working..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:95 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:95 msgid "Brazilian Portuguese" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:96 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:96 msgid "English (UK)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:97 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:97 msgid "Simplified Chinese" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:98 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:98 msgid "Chinese (HK)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:99 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:99 msgid "Traditional Chinese" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:100 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:100 msgid "English" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:101 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:101 msgid "English (Australia)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:102 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:102 msgid "English (New Zealand)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:103 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:103 msgid "English (Canada)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:104 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:104 msgid "English (India)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:105 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:105 msgid "English (Thailand)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:106 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:106 msgid "English (Cyprus)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:107 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:107 msgid "English (Pakistan)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:108 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:108 msgid "English (Israel)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:109 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:109 msgid "English (Singapore)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:110 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:110 msgid "English (Yemen)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:111 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:111 msgid "English (Ireland)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:112 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:112 msgid "English (China)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:113 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:113 msgid "Spanish (Paraguay)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:114 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:114 msgid "German (AT)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:115 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:115 +msgid "French (BE)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:116 msgid "Dutch (NL)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/localization.py:116 +#: /home/kovid/work/calibre/src/calibre/utils/localization.py:117 msgid "Dutch (BE)" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:53 +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:56 +msgid "Choose theme (needs restart)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:188 +msgid "No interpreter" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:189 +msgid "No active interpreter found. Try restarting the console" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:203 +msgid "Interpreter died" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/console.py:204 +msgid "Interpreter dies while excuting a command. To see the command, click Show details" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:20 +msgid "Welcome to" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:41 +msgid " console " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:51 +msgid "Code is running" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/pyconsole/main.py:58 +msgid "Restart console" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53 msgid "URL must have the scheme sftp" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:57 +#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57 msgid "host must be of the form user@hostname" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:68 +#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68 msgid "Failed to negotiate SSH session: " msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/sftp.py:71 +#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71 msgid "Failed to authenticate with server: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/utils/smtp.py:230 +#: /home/kovid/work/calibre/src/calibre/utils/smtp.py:230 msgid "Control email delivery" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:118 +#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:118 msgid "Unknown section" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:140 +#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:140 msgid "Unknown feed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:158 -#: /home/kovid/work/trunk/src/calibre/web/feeds/__init__.py:185 +#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:158 +#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:185 msgid "Untitled article" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:22 +#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:22 msgid "Download periodical content from the internet" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:37 +#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:37 msgid "Useful for recipe development. Forces max_articles_per_feed to 2 and downloads at most 2 feeds." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:40 +#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:40 msgid "Username for sites that require a login to access content." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:43 +#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:43 msgid "Password for sites that require a login to access content." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/input.py:47 +#: /home/kovid/work/calibre/src/calibre/web/feeds/input.py:47 msgid "Do not download latest version of builtin recipes from the calibre server" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:47 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:47 msgid "Unknown News Source" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:612 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:612 msgid "The \"%s\" recipe needs a username and password." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:711 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:711 msgid "Download finished" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:713 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:713 msgid "Failed to download the following articles:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:719 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:719 msgid "Failed to download parts of the following articles:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:721 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:721 msgid " from " msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:723 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:723 msgid "\tFailed links:" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:812 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:812 msgid "Could not fetch article. Run with -vv to see the reason" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:833 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:833 msgid "Fetching feeds..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:838 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:838 msgid "Got feeds from index page" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:844 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844 msgid "Trying to download cover..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:846 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846 msgid "Generating masthead..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:927 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:927 msgid "Starting download [%d thread(s)]..." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:943 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:943 msgid "Feeds downloaded to %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:952 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:952 msgid "Could not download cover: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:959 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959 msgid "Downloading cover from %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1004 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1004 msgid "Masthead image downloaded" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1172 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1172 msgid "Untitled Article" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1243 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1243 msgid "Article downloaded: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1254 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1254 msgid "Article download failed: %s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1271 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1271 msgid "Fetching feed" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1418 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1418 msgid "Failed to log in, check your username and password for the calibre Periodicals service." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/news.py:1433 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1433 msgid "You do not have permission to download this issue. Either your subscription has expired or you have exceeded the maximum allowed downloads for today." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/collection.py:47 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:47 msgid "You" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:73 -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:82 -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:193 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:73 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:82 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:193 msgid "Scheduled" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:84 -#: /home/kovid/work/trunk/src/calibre/web/feeds/recipes/model.py:194 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84 +#: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:194 msgid "Custom" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:482 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:482 msgid "" "%prog URL\n" "\n" "Where URL is for example http://google.com" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:485 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:485 msgid "Base directory into which URL is saved. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:488 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:488 msgid "Timeout in seconds to wait for a response from the server. Default: %default s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:491 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:491 msgid "Maximum number of levels to recurse i.e. depth of links to follow. Default %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:494 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:494 msgid "The maximum number of files to download. This only applies to files from <a href> tags. Default is %default" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:496 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:496 msgid "Minimum interval in seconds between consecutive fetches. Default is %default s" msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:498 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:498 msgid "The character encoding for the websites you are trying to download. The default is to try and guess the encoding." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:500 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:500 msgid "Only links that match this regular expression will be followed. This option can be specified multiple times, in which case as long as a link matches any one regexp, it will be followed. By default all links are followed." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:502 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:502 msgid "Any link that matches this regular expression will be ignored. This option can be specified multiple times, in which case as long as any regexp matches a link, it will be ignored.By default, no links are ignored. If both --filter-regexp and --match-regexp are specified, then --filter-regexp is applied first." msgstr "" -#: /home/kovid/work/trunk/src/calibre/web/fetch/simple.py:504 +#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:504 msgid "Do not download CSS stylesheets." msgstr "" From b16ede44fb08f466444ae1b7f4ac38d3ad9d58e1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 13:35:04 -0600 Subject: [PATCH 222/235] Close open file descriptors in calibre worker processes --- src/calibre/utils/ipc/worker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index b7510426aa..abdd095d62 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -76,6 +76,8 @@ def get_func(name): return func, notification def main(): + # Close open file descriptors inherited from parent + os.closerange(3, 1000) from calibre.constants import isosx if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to From 52aaef4407658f7184c66af4a41347df8aec50c1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 14:34:14 -0600 Subject: [PATCH 223/235] Only close open file handles on windows, since on Unix, it creates so far undiagnosed issues --- src/calibre/utils/ipc/worker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index abdd095d62..42618f7996 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -13,6 +13,7 @@ from Queue import Queue from contextlib import closing from binascii import unhexlify from calibre import prints +from calibre.constants import iswindows PARALLEL_FUNCS = { 'lrfviewer' : @@ -77,7 +78,9 @@ def get_func(name): def main(): # Close open file descriptors inherited from parent - os.closerange(3, 1000) + # as windows locks open files + if iswindows: + os.closerange(3, 1000) from calibre.constants import isosx if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to From 326dd8b335c3ad1d85f15db41dcb326ecf485e5b Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 15:12:23 -0600 Subject: [PATCH 224/235] Always close inherited file descriptors in worker process --- src/calibre/utils/ipc/launch.py | 6 ++++++ src/calibre/utils/ipc/worker.py | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/ipc/launch.py b/src/calibre/utils/ipc/launch.py index 9c50208935..e13c9e0cb6 100644 --- a/src/calibre/utils/ipc/launch.py +++ b/src/calibre/utils/ipc/launch.py @@ -183,6 +183,12 @@ class Worker(object): args['stdout'] = _windows_null_file args['stderr'] = subprocess.STDOUT + if not iswindows: + # Close inherited file descriptors in worker + # On windows, this is done in the worker process + # itself + args['close_fds'] = True + self.child = subprocess.Popen(cmd, **args) if 'stdin' in args: self.child.stdin.close() diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index 42618f7996..4d23d5a928 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -47,6 +47,11 @@ PARALLEL_FUNCS = { ('calibre.ebooks.metadata.worker', 'save_book', 'notification'), } +try: + MAXFD = os.sysconf("SC_OPEN_MAX") +except: + MAXFD = 256 + class Progress(Thread): def __init__(self, conn): @@ -80,7 +85,7 @@ def main(): # Close open file descriptors inherited from parent # as windows locks open files if iswindows: - os.closerange(3, 1000) + os.closerange(3, MAXFD) from calibre.constants import isosx if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to From 6bd9287891a6aad3da51d945877879e614523942 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 15:18:05 -0600 Subject: [PATCH 225/235] ... --- src/calibre/utils/ipc/worker.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index 4d23d5a928..f237104827 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -13,7 +13,7 @@ from Queue import Queue from contextlib import closing from binascii import unhexlify from calibre import prints -from calibre.constants import iswindows +from calibre.constants import iswindows, isosx PARALLEL_FUNCS = { 'lrfviewer' : @@ -82,11 +82,10 @@ def get_func(name): return func, notification def main(): - # Close open file descriptors inherited from parent - # as windows locks open files if iswindows: + # Close open file descriptors inherited from parent + # On Unix this is done by the subprocess module os.closerange(3, MAXFD) - from calibre.constants import isosx if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to # launch the last run process from the bundle From cb24b0312e44eff427c223e4c61ed3e17c3c099a Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 15:31:39 -0600 Subject: [PATCH 226/235] Remove use of sysconf since it isn't available on windows anyway --- src/calibre/utils/ipc/worker.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/calibre/utils/ipc/worker.py b/src/calibre/utils/ipc/worker.py index f237104827..e3584380a1 100644 --- a/src/calibre/utils/ipc/worker.py +++ b/src/calibre/utils/ipc/worker.py @@ -47,11 +47,6 @@ PARALLEL_FUNCS = { ('calibre.ebooks.metadata.worker', 'save_book', 'notification'), } -try: - MAXFD = os.sysconf("SC_OPEN_MAX") -except: - MAXFD = 256 - class Progress(Thread): def __init__(self, conn): @@ -85,7 +80,7 @@ def main(): if iswindows: # Close open file descriptors inherited from parent # On Unix this is done by the subprocess module - os.closerange(3, MAXFD) + os.closerange(3, 256) if isosx and 'CALIBRE_WORKER_ADDRESS' not in os.environ: # On some OS X computers launchd apparently tries to # launch the last run process from the bundle From 625e478ce057c1359eb2dce752f0d44c7dded211 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 16:47:17 -0600 Subject: [PATCH 227/235] Use process local file descriptors in db2 --- session.vim | 2 +- setup/check.py | 2 +- src/calibre/library/caches.py | 2 +- src/calibre/library/database.py | 2 +- src/calibre/library/database2.py | 24 ++++----- src/calibre/startup.py | 84 ++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 16 deletions(-) diff --git a/session.vim b/session.vim index 6b965cff2f..54fb6305c2 100644 --- a/session.vim +++ b/session.vim @@ -1,5 +1,5 @@ " Project wide builtins -let g:pyflakes_builtins += ["dynamic_property", "__", "P", "I"] +let g:pyflakes_builtins += ["dynamic_property", "__", "P", "I", "lopen"] python << EOFPY import os diff --git a/setup/check.py b/setup/check.py index 9106ca6871..57c72e08c1 100644 --- a/setup/check.py +++ b/setup/check.py @@ -63,7 +63,7 @@ class Check(Command): description = 'Check for errors in the calibre source code' - BUILTINS = ['_', '__', 'dynamic_property', 'I', 'P'] + BUILTINS = ['_', '__', 'dynamic_property', 'I', 'P', 'lopen'] CACHE = '.check-cache.pickle' def get_files(self, cache): diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 179262dedc..c22f9e00b0 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -112,7 +112,7 @@ class MetadataBackup(Thread): # {{{ traceback.print_exc() def write(self, path, raw): - with open(path, 'wb') as f: + with lopen(path, 'wb') as f: f.write(raw) diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py index 28a0de2153..c4f6908002 100644 --- a/src/calibre/library/database.py +++ b/src/calibre/library/database.py @@ -1333,7 +1333,7 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE; id = obj.lastrowid self.conn.commit() self.set_metadata(id, mi) - stream = path if hasattr(path, 'read') else open(path, 'rb') + stream = path if hasattr(path, 'read') else lopen(path, 'rb') stream.seek(0, 2) usize = stream.tell() stream.seek(0) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 9d9ebf64c5..4de8c3d552 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -453,7 +453,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if current_path and os.path.exists(spath): # Migrate existing files cdata = self.cover(id, index_is_id=True) if cdata is not None: - with open(os.path.join(tpath, 'cover.jpg'), 'wb') as f: + with lopen(os.path.join(tpath, 'cover.jpg'), 'wb') as f: f.write(cdata) for format in formats: # Get data as string (can't use file as source and target files may be the same) @@ -526,10 +526,10 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if as_path: return path try: - f = open(path, 'rb') + f = lopen(path, 'rb') except (IOError, OSError): time.sleep(0.2) - f = open(path, 'rb') + f = lopen(path, 'rb') if as_image: img = QImage() img.loadFromData(f.read()) @@ -607,7 +607,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): continue try: raw = metadata_to_opf(mi) - with open(path, 'wb') as f: + with lopen(path, 'wb') as f: f.write(raw) except: # Something went wrong. Put the book back on the dirty list @@ -906,7 +906,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): ''' path = self.format_abspath(index, format, index_is_id=index_is_id) if path is not None: - f = open(path, mode) + f = lopen(path, mode) try: ret = f if as_file else f.read() except IOError: @@ -922,7 +922,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): path=None, notify=True): npath = self.run_import_plugins(fpath, format) format = os.path.splitext(npath)[-1].lower().replace('.', '').upper() - stream = open(npath, 'rb') + stream = lopen(npath, 'rb') format = check_ebook_format(stream, format) return self.add_format(index, format, stream, index_is_id=index_is_id, path=path, notify=notify) @@ -943,7 +943,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): pdir = os.path.dirname(dest) if not os.path.exists(pdir): os.makedirs(pdir) - with open(dest, 'wb') as f: + with lopen(dest, 'wb') as f: shutil.copyfileobj(stream, f) stream.seek(0, 2) size=stream.tell() @@ -1271,7 +1271,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if mi.cover_data[1] is not None: doit(self.set_cover, id, mi.cover_data[1]) # doesn't use commit elif mi.cover is not None and os.access(mi.cover, os.R_OK): - doit(self.set_cover, id, open(mi.cover, 'rb')) + doit(self.set_cover, id, lopen(mi.cover, 'rb')) if mi.tags: doit(self.set_tags, id, mi.tags, notify=False, commit=False) if mi.comments: @@ -1923,7 +1923,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def add_catalog(self, path, title): format = os.path.splitext(path)[1][1:].lower() - with open(path, 'rb') as stream: + with lopen(path, 'rb') as stream: matches = self.data.get_matches('title', '='+title) if matches: tag_matches = self.data.get_matches('tags', '='+_('Catalog')) @@ -1958,7 +1958,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def add_news(self, path, arg): format = os.path.splitext(path)[1][1:].lower() - stream = path if hasattr(path, 'read') else open(path, 'rb') + stream = path if hasattr(path, 'read') else lopen(path, 'rb') stream.seek(0) mi = get_metadata(stream, format, use_libprs_metadata=False) stream.seek(0) @@ -2084,7 +2084,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): self.set_metadata(id, mi) npath = self.run_import_plugins(path, format) format = os.path.splitext(npath)[-1].lower().replace('.', '').upper() - stream = open(npath, 'rb') + stream = lopen(npath, 'rb') format = check_ebook_format(stream, format) self.add_format(id, format, stream, index_is_id=True) stream.close() @@ -2128,7 +2128,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): if import_hooks: self.add_format_with_hooks(id, ext, path, index_is_id=True) else: - with open(path, 'rb') as f: + with lopen(path, 'rb') as f: self.add_format(id, ext, f, index_is_id=True) self.conn.commit() self.data.refresh_ids(self, [id]) # Needed to update format list and size diff --git a/src/calibre/startup.py b/src/calibre/startup.py index 75aac7c277..9f745f60ff 100644 --- a/src/calibre/startup.py +++ b/src/calibre/startup.py @@ -21,6 +21,12 @@ from calibre.constants import iswindows, preferred_encoding, plugins _run_once = False winutil = winutilerror = None +try: + import fcntl +except: + fcntl + fcntl = None + if not _run_once: _run_once = True @@ -106,5 +112,83 @@ if not _run_once: os.path.join = my_join + def local_open(name, mode='r', bufsize=-1): + ''' + Open a file that wont be inherited by child processes + + Only supports the following modes: + r, w, a, rb, wb, ab, r+, w+, a+, r+b, w+b, a+b + ''' + if iswindows: + m = mode[0] + random = len(mode) > 1 and mode[1] == '+' + binary = mode[-1] == 'b' + + if m == 'a': + flags = os._O_APPEND| os._O_RDWR + flags |= os._O_RANDOM if random else os._O_SEQUENTIAL + elif m == 'r': + if random: + flags = os._O_RDWR | os._O_RANDOM + else: + flags = os._O_RDONLY | os._O_SEQUENTIAL + elif m == 'w': + if random: + flags = os._O_RDWR | os._O_RANDOM + else: + flags = os._WRONLY | os._O_SEQUENTIAL + flags |= os._O_TRUNC | os._O_CREAT + if binary: + flags |= os._O_BINARY + else: + flags |= os._O_TEXT + flags |= os._O_NOINHERIT + fd = os.open(name, flags) + ans = os.fdopen(fd, mode, bufsize) + else: + try: + cloexec_flag = fcntl.FD_CLOEXEC + except AttributeError: + cloexec_flag = 1 + ans = open(name, mode, bufsize) + old = fcntl.fcntl(ans, fcntl.F_GETFD) + fcntl.fcntl(ans, fcntl.F_SETFD, old | cloexec_flag) + return ans + + __builtin__.__dict__['lopen'] = local_open + +def test_lopen(): + from calibre.ptempfile import TemporaryDirectory + from calibre import CurrentDir + n = u'f\xe4llen' + + with TemporaryDirectory() as tdir: + with CurrentDir(tdir): + with lopen(n, 'w') as f: + f.write('one') + print 'O_CREAT tested' + with lopen(n, 'w+b') as f: + f.write('two') + with lopen(n, 'r') as f: + if f.read() == 'two': + print 'O_TRUNC tested' + else: + raise Exception('O_TRUNC failed') + with lopen(n, 'ab') as f: + f.write('three') + with lopen(n, 'r+') as f: + if f.read() == 'twothree': + print 'O_APPEND tested' + else: + raise Exception('O_APPEND failed') + with lopen(n, 'r+') as f: + f.seek(3) + f.write('xxxxx') + f.seek(0) + if f.read() == 'twoxxxxx': + print 'O_RANDOM tested' + else: + raise Exception('O_RANDOM failed') + From 3bffc1a48ce2e89d67cf4204995c76b97608c1b4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 16:50:41 -0600 Subject: [PATCH 228/235] ... --- src/calibre/startup.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/calibre/startup.py b/src/calibre/startup.py index 9f745f60ff..143a3edb47 100644 --- a/src/calibre/startup.py +++ b/src/calibre/startup.py @@ -21,12 +21,6 @@ from calibre.constants import iswindows, preferred_encoding, plugins _run_once = False winutil = winutilerror = None -try: - import fcntl -except: - fcntl - fcntl = None - if not _run_once: _run_once = True @@ -146,6 +140,7 @@ if not _run_once: fd = os.open(name, flags) ans = os.fdopen(fd, mode, bufsize) else: + import fcntl try: cloexec_flag = fcntl.FD_CLOEXEC except AttributeError: From 97eec2c16db65dd8f09ef045f48717dd0942c915 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 16:52:14 -0600 Subject: [PATCH 229/235] ... --- src/calibre/startup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/startup.py b/src/calibre/startup.py index 143a3edb47..1712a08ab1 100644 --- a/src/calibre/startup.py +++ b/src/calibre/startup.py @@ -130,7 +130,7 @@ if not _run_once: if random: flags = os._O_RDWR | os._O_RANDOM else: - flags = os._WRONLY | os._O_SEQUENTIAL + flags = os._O_WRONLY | os._O_SEQUENTIAL flags |= os._O_TRUNC | os._O_CREAT if binary: flags |= os._O_BINARY From 47f93f4c9c0e0c3ff40596a0b2e64c2e39e575bf Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 16:53:54 -0600 Subject: [PATCH 230/235] ... --- src/calibre/startup.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/calibre/startup.py b/src/calibre/startup.py index 1712a08ab1..9d5c4b51fc 100644 --- a/src/calibre/startup.py +++ b/src/calibre/startup.py @@ -119,24 +119,24 @@ if not _run_once: binary = mode[-1] == 'b' if m == 'a': - flags = os._O_APPEND| os._O_RDWR - flags |= os._O_RANDOM if random else os._O_SEQUENTIAL + flags = os.O_APPEND| os.O_RDWR + flags |= os.O_RANDOM if random else os.O_SEQUENTIAL elif m == 'r': if random: - flags = os._O_RDWR | os._O_RANDOM + flags = os.O_RDWR | os.O_RANDOM else: - flags = os._O_RDONLY | os._O_SEQUENTIAL + flags = os.O_RDONLY | os.O_SEQUENTIAL elif m == 'w': if random: - flags = os._O_RDWR | os._O_RANDOM + flags = os.O_RDWR | os.O_RANDOM else: - flags = os._O_WRONLY | os._O_SEQUENTIAL - flags |= os._O_TRUNC | os._O_CREAT + flags = os.O_WRONLY | os.O_SEQUENTIAL + flags |= os.O_TRUNC | os.O_CREAT if binary: - flags |= os._O_BINARY + flags |= os.O_BINARY else: - flags |= os._O_TEXT - flags |= os._O_NOINHERIT + flags |= os.O_TEXT + flags |= os.O_NOINHERIT fd = os.open(name, flags) ans = os.fdopen(fd, mode, bufsize) else: From 54ee947072e7c9f7de9e6ae56aa793543b5ab8e2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 17:03:51 -0600 Subject: [PATCH 231/235] Fix unicode issues in new preprocess code --- src/calibre/ebooks/conversion/preprocess.py | 6 ++-- src/calibre/ebooks/conversion/utils.py | 32 ++++++++++++--------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py index bb5c26a50c..c5ebae4bba 100644 --- a/src/calibre/ebooks/conversion/preprocess.py +++ b/src/calibre/ebooks/conversion/preprocess.py @@ -184,14 +184,14 @@ class Dehyphenator(object): wraptags = match.group('wraptags') except: wraptags = '' - hyphenated = str(firsthalf) + "-" + str(secondhalf) - dehyphenated = str(firsthalf) + str(secondhalf) + hyphenated = unicode(firsthalf) + "-" + unicode(secondhalf) + dehyphenated = unicode(firsthalf) + unicode(secondhalf) lookupword = self.removesuffixes.sub('', dehyphenated) if self.prefixes.match(firsthalf) is None: lookupword = self.removeprefix.sub('', lookupword) #print "lookup word is: "+str(lookupword)+", orig is: " + str(hyphenated) try: - searchresult = self.html.find(str.lower(lookupword)) + searchresult = self.html.find(lookupword.lower()) except: return hyphenated if self.format == 'html_cleanup': diff --git a/src/calibre/ebooks/conversion/utils.py b/src/calibre/ebooks/conversion/utils.py index 5f5c12a703..2faec27b68 100644 --- a/src/calibre/ebooks/conversion/utils.py +++ b/src/calibre/ebooks/conversion/utils.py @@ -22,18 +22,21 @@ class PreProcessor(object): title = match.group('title') if not title: self.html_preprocess_sections = self.html_preprocess_sections + 1 - self.log("found " + str(self.html_preprocess_sections) + " chapters. - " + str(chap)) + self.log("found " + unicode(self.html_preprocess_sections) + + " chapters. - " + unicode(chap)) return '<h2>'+chap+'</h2>\n' else: self.html_preprocess_sections = self.html_preprocess_sections + 1 - self.log("found " + str(self.html_preprocess_sections) + " chapters & titles. - " + str(chap) + ", " + str(title)) + self.log("found " + unicode(self.html_preprocess_sections) + + " chapters & titles. - " + unicode(chap) + ", " + unicode(title)) return '<h2>'+chap+'</h2>\n<h3>'+title+'</h3>\n' def chapter_break(self, match): chap = match.group('section') styles = match.group('styles') self.html_preprocess_sections = self.html_preprocess_sections + 1 - self.log("marked " + str(self.html_preprocess_sections) + " section markers based on punctuation. - " + str(chap)) + self.log("marked " + unicode(self.html_preprocess_sections) + + " section markers based on punctuation. - " + unicode(chap)) return '<'+styles+' style="page-break-before:always">'+chap def insert_indent(self, match): @@ -63,7 +66,8 @@ class PreProcessor(object): line_end = line_end_ere.findall(raw) tot_htm_ends = len(htm_end) tot_ln_fds = len(line_end) - self.log("There are " + str(tot_ln_fds) + " total Line feeds, and " + str(tot_htm_ends) + " marked up endings") + self.log("There are " + unicode(tot_ln_fds) + " total Line feeds, and " + + unicode(tot_htm_ends) + " marked up endings") if percent > 1: percent = 1 @@ -71,7 +75,7 @@ class PreProcessor(object): percent = 0 min_lns = tot_ln_fds * percent - self.log("There must be fewer than " + str(min_lns) + " unmarked lines to add markup") + self.log("There must be fewer than " + unicode(min_lns) + " unmarked lines to add markup") if min_lns > tot_htm_ends: return True @@ -112,7 +116,7 @@ class PreProcessor(object): txtindent = re.compile(ur'<p(?P<formatting>[^>]*)>\s*(?P<span>(<span[^>]*>\s*)+)?\s*(\u00a0){2,}', re.IGNORECASE) html = txtindent.sub(self.insert_indent, html) if self.found_indents > 1: - self.log("replaced "+str(self.found_indents)+ " nbsp indents with inline styles") + self.log("replaced "+unicode(self.found_indents)+ " nbsp indents with inline styles") # remove remaining non-breaking spaces html = re.sub(ur'\u00a0', ' ', html) # Get rid of empty <o:p> tags to simplify other processing @@ -131,7 +135,8 @@ class PreProcessor(object): lines = linereg.findall(html) blanks_between_paragraphs = False if len(lines) > 1: - self.log("There are " + str(len(blanklines)) + " blank lines. " + str(float(len(blanklines)) / float(len(lines))) + " percent blank") + self.log("There are " + unicode(len(blanklines)) + " blank lines. " + + unicode(float(len(blanklines)) / float(len(lines))) + " percent blank") if float(len(blanklines)) / float(len(lines)) > 0.40 and getattr(self.extra_opts, 'remove_paragraph_spacing', False): self.log("deleting blank lines") @@ -170,20 +175,20 @@ class PreProcessor(object): #print chapter_marker heading = re.compile('<h[1-3][^>]*>', re.IGNORECASE) self.html_preprocess_sections = len(heading.findall(html)) - self.log("found " + str(self.html_preprocess_sections) + " pre-existing headings") + self.log("found " + unicode(self.html_preprocess_sections) + " pre-existing headings") # # Start with most typical chapter headings, get more aggressive until one works if self.html_preprocess_sections < 10: chapdetect = re.compile(r'%s' % chapter_marker, re.IGNORECASE) html = chapdetect.sub(self.chapter_head, html) if self.html_preprocess_sections < 10: - self.log("not enough chapters, only " + str(self.html_preprocess_sections) + ", trying numeric chapters") + self.log("not enough chapters, only " + unicode(self.html_preprocess_sections) + ", trying numeric chapters") chapter_marker = lookahead+chapter_line_open+chapter_header_open+numeric_chapters+chapter_header_close+chapter_line_close+blank_lines+opt_title_open+title_line_open+title_header_open+default_title+title_header_close+title_line_close+opt_title_close chapdetect2 = re.compile(r'%s' % chapter_marker, re.IGNORECASE) html = chapdetect2.sub(self.chapter_head, html) if self.html_preprocess_sections < 10: - self.log("not enough chapters, only " + str(self.html_preprocess_sections) + ", trying with uppercase words") + self.log("not enough chapters, only " + unicode(self.html_preprocess_sections) + ", trying with uppercase words") chapter_marker = lookahead+chapter_line_open+chapter_header_open+uppercase_chapters+chapter_header_close+chapter_line_close+blank_lines+opt_title_open+title_line_open+title_header_open+default_title+title_header_close+title_line_close+opt_title_close chapdetect2 = re.compile(r'%s' % chapter_marker, re.UNICODE) html = chapdetect2.sub(self.chapter_head, html) @@ -207,11 +212,11 @@ class PreProcessor(object): # more of the lines break in the same region of the document then unwrapping is required docanalysis = DocAnalysis(format, html) hardbreaks = docanalysis.line_histogram(.50) - self.log("Hard line breaks check returned "+str(hardbreaks)) + self.log("Hard line breaks check returned "+unicode(hardbreaks)) # Calculate Length unwrap_factor = getattr(self.extra_opts, 'html_unwrap_factor', 0.4) length = docanalysis.line_length(unwrap_factor) - self.log("*** Median line length is " + str(length) + ", calculated with " + format + " format ***") + self.log("*** Median line length is " + unicode(length) + ", calculated with " + format + " format ***") # only go through unwrapping code if the histogram shows unwrapping is required or if the user decreased the default unwrap_factor if hardbreaks or unwrap_factor < 0.4: self.log("Unwrapping required, unwrapping Lines") @@ -240,7 +245,8 @@ class PreProcessor(object): # If still no sections after unwrapping mark split points on lines with no punctuation if self.html_preprocess_sections < 10: - self.log("Looking for more split points based on punctuation, currently have " + str(self.html_preprocess_sections)) + self.log("Looking for more split points based on punctuation," + " currently have " + unicode(self.html_preprocess_sections)) chapdetect3 = re.compile(r'<(?P<styles>(p|div)[^>]*)>\s*(?P<section>(<span[^>]*>)?\s*(<[ibu][^>]*>){0,2}\s*(<span[^>]*>)?\s*(<[ibu][^>]*>){0,2}\s*(<span[^>]*>)?\s*.?(?=[a-z#\-*\s]+<)([a-z#-*]+\s*){1,5}\s*\s*(</span>)?(</[ibu]>){0,2}\s*(</span>)?\s*(</[ibu]>){0,2}\s*(</span>)?\s*</(p|div)>)', re.IGNORECASE) html = chapdetect3.sub(self.chapter_break, html) # search for places where a first or second level heading is immediately followed by another From f90e1a7bd85e4f60d404e61897a66dd67a401a8b Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 21:02:50 -0600 Subject: [PATCH 232/235] Prettier look & feel icon --- imgsrc/lookfeel.svg | 1297 +++++++++++++++++++++++++++------ resources/images/lookfeel.png | Bin 2510 -> 16529 bytes 2 files changed, 1064 insertions(+), 233 deletions(-) diff --git a/imgsrc/lookfeel.svg b/imgsrc/lookfeel.svg index aeee997941..81a68e2088 100644 --- a/imgsrc/lookfeel.svg +++ b/imgsrc/lookfeel.svg @@ -15,13 +15,341 @@ sodipodi:version="0.32" inkscape:version="0.44" version="1.0" - sodipodi:docbase="/home/david/Progetti/oxygen-svn/Oxygen/theme/svg/actions" - sodipodi:docname="indent.svg" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/text_center.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + sodipodi:docbase="/home/pinheiro/artwork/Oxygen/theme/svg/actions" + sodipodi:docname="color_fill.svg"> <defs id="defs1309"> + <linearGradient + inkscape:collect="always" + id="linearGradient3328"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3330" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3332" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3320"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3322" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3324" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3294"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3296" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3298" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3286"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3288" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3290" /> + </linearGradient> + <linearGradient + id="linearGradient2857"> + <stop + style="stop-color:black;stop-opacity:0.44765344;" + offset="0" + id="stop2859" /> + <stop + id="stop2873" + offset="0.5" + style="stop-color:black;stop-opacity:0.13357401;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop2861" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient2845"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop2847" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop2849" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8864"> + <stop + style="stop-color:#393a38;stop-opacity:1;" + offset="0" + id="stop8866" /> + <stop + style="stop-color:#393a38;stop-opacity:0;" + offset="1" + id="stop8868" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8817"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop8819" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop8821" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8807"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop8809" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop8811" /> + </linearGradient> + <linearGradient + id="linearGradient5895"> + <stop + style="stop-color:white;stop-opacity:0;" + offset="0" + id="stop5897" /> + <stop + id="stop5901" + offset="0.5" + style="stop-color:#7f7f7f;stop-opacity:0;" /> + <stop + style="stop-color:black;stop-opacity:1;" + offset="1" + id="stop5899" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3141"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3144" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3146" /> + </linearGradient> + <linearGradient + id="linearGradient3075"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3077" /> + <stop + id="stop3093" + offset="0.42597079" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3085" + offset="0.5892781" + style="stop-color:#f1f1f1;stop-opacity:1;" /> + <stop + style="stop-color:#eaeaea;stop-opacity:1;" + offset="0.80219781" + id="stop3087" /> + <stop + style="stop-color:#dfdfdf;stop-opacity:1;" + offset="1" + id="stop3079" /> + </linearGradient> + <linearGradient + id="linearGradient3325"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3327" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop3329" /> + </linearGradient> + <linearGradient + id="linearGradient2221"> + <stop + id="stop2223" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0.68235294;" + offset="0.40659341" + id="stop2225" /> + <stop + id="stop2227" + offset="0.45329672" + style="stop-color:#000000;stop-opacity:0.48736462;" /> + <stop + style="stop-color:#000000;stop-opacity:0.36101082;" + offset="0.5" + id="stop2229" /> + <stop + id="stop2231" + offset="0.70604396" + style="stop-color:#000000;stop-opacity:0.15162455;" /> + <stop + id="stop2233" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2221" + id="linearGradient7829" + gradientUnits="userSpaceOnUse" + x1="-82.509743" + y1="64.065186" + x2="-118.91476" + y2="63.447075" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2221" + id="linearGradient7831" + gradientUnits="userSpaceOnUse" + x1="-146.75171" + y1="74.959991" + x2="-123.66653" + y2="73.415115" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3141" + id="linearGradient7833" + gradientUnits="userSpaceOnUse" + x1="-113.6435" + y1="78.293831" + x2="-118.30019" + y2="33.764427" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8817" + id="radialGradient8823" + cx="63.84724" + cy="121.47017" + fx="95.480644" + fy="121.47017" + r="63.84724" + gradientTransform="matrix(1,0,0,0.102273,0,109.0471)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8807" + id="radialGradient8832" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.962775,0.103895,0.105414,6.978879,33.03078,-433.3987)" + cx="-16.60284" + cy="73.863823" + fx="-16.60284" + fy="73.863823" + r="4.390625" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient8845" + gradientUnits="userSpaceOnUse" + x1="106.2739" + y1="52.468563" + x2="79.54409" + y2="69.991898" + gradientTransform="matrix(0.961459,-4.366598e-2,-5.518e-3,1.121052,8.015668,-2.987019)" + spreadMethod="reflect" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3141" + id="linearGradient8853" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.129522,8.477695e-2,5.309184e-2,1.206648,150.0367,-10.45332)" + x1="-116.78745" + y1="116.55856" + x2="-84.77729" + y2="93.56797" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5895" + id="radialGradient8856" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.126369,-0.578005,0.706687,1.338259,-56.17696,13.71076)" + cx="70.623695" + cy="53.380299" + fx="70.964447" + fy="76.702087" + r="53.565186" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3075" + id="linearGradient8859" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.129522,8.477695e-2,5.309184e-2,1.206648,150.0367,-10.45332)" + x1="-70.057068" + y1="95.781326" + x2="-27.8897" + y2="66.671455" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8864" + id="linearGradient8870" + x1="95.84687" + y1="117.20569" + x2="76.361786" + y2="88.409065" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.962775,0.103895,1.547901e-2,1.024792,1.181389,-2.598443)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8864" + id="linearGradient8872" + x1="87.068436" + y1="146.89471" + x2="105.05599" + y2="58.65321" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.962775,0.103895,1.547901e-2,1.024792,1.181389,-2.598443)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2845" + id="radialGradient2853" + cx="104.66048" + cy="65.847801" + fx="115.7285" + fy="56.281128" + r="29.998838" + gradientTransform="matrix(0.453553,-0.261287,1.03209,1.791544,-20.21086,-24.28382)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2857" + id="linearGradient2863" + x1="98.669891" + y1="112.10143" + x2="74.325119" + y2="85.423767" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,5.335533)" /> <linearGradient id="linearGradient3291" inkscape:collect="always"> @@ -34,62 +362,483 @@ offset="1" style="stop-color:#000000;stop-opacity:0;" /> </linearGradient> + <linearGradient + id="linearGradient3225"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3227" /> + <stop + style="stop-color:#aeaeae;stop-opacity:1;" + offset="1" + id="stop3229" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3286" + id="linearGradient3292" + x1="78.569206" + y1="22.051414" + x2="41.437614" + y2="59.81057" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3294" + id="linearGradient3300" + x1="23.02284" + y1="104.74906" + x2="22.669342" + y2="135.73619" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3325" + id="linearGradient3308" + x1="24.650917" + y1="111.04127" + x2="24.945656" + y2="122.54212" + gradientUnits="userSpaceOnUse" /> <radialGradient inkscape:collect="always" - xlink:href="#linearGradient3291" - id="radialGradient4000" + xlink:href="#linearGradient3320" + id="radialGradient3326" + cx="29.962149" + cy="131.46768" + fx="29.962149" + fy="131.46768" + r="27.01967" + gradientTransform="matrix(0.709744,-1.62743e-2,3.676083e-3,0.160321,7.971984,102.5261)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3328" + id="radialGradient3334" + cx="27.565985" + cy="130.94269" + fx="27.565985" + fy="130.94269" + r="27.01967" + gradientTransform="matrix(1,0,0,0.280337,0,85.27881)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.997548,0,0.124737)" + r="43.677402" + fy="15.637197" + fx="112.22926" + cy="42.78688" + cx="86.75824" + id="radialGradient3127" + xlink:href="#linearGradient3074" + inkscape:collect="always" /> + <radialGradient + r="2.6143965" + fy="56.693035" + fx="45.944534" + cy="56.693035" + cx="45.944534" + gradientTransform="matrix(2.477216,2.517536,-36.22697,36.17785,1993.16,-2091.56)" + gradientUnits="userSpaceOnUse" + id="radialGradient3114" + xlink:href="#linearGradient2598" + inkscape:collect="always" /> + <radialGradient + r="47.746403" + fy="100.74671" + fx="89.454559" + cy="100.74671" + cx="89.454559" + gradientTransform="matrix(8.591691e-2,8.486812e-2,-1.08813,1.101573,44.11233,-68.64069)" + gradientUnits="userSpaceOnUse" + id="radialGradient3111" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(1.091956,0,0,1.091956,-11.74518,-2.311124e-2)" + y2="39.836784" + x2="112.42268" + y1="39.836784" + x1="36.229935" + gradientUnits="userSpaceOnUse" + id="linearGradient3108" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <radialGradient + r="47.595197" + fy="241.42075" + fx="99.251144" + cy="238.65808" + cx="76.492363" + gradientTransform="matrix(7.158357e-2,7.766505e-2,-1.060958,1.060958,300.5466,-199.6057)" + gradientUnits="userSpaceOnUse" + id="radialGradient3105" + xlink:href="#linearGradient3303" + inkscape:collect="always" /> + <radialGradient + r="47.595196" + fy="-98.683281" + fx="51.432114" + cy="-98.683281" + cx="51.432114" + gradientTransform="matrix(-0.963219,0.963219,-1.777098e-2,-1.75145e-2,114.9489,-0.46139)" + gradientUnits="userSpaceOnUse" + id="radialGradient3102" + xlink:href="#linearGradient3325" + inkscape:collect="always" /> + <radialGradient + r="3.9750404" + fy="6.7701697" + fx="47.370888" + cy="8.4953117" + cx="49.009884" + gradientTransform="matrix(2.622255,2.657916,-0.998038,0.991844,-19.06769,-111.5896)" + gradientUnits="userSpaceOnUse" + id="radialGradient3099" + xlink:href="#linearGradient3972" + inkscape:collect="always" /> + <radialGradient + r="1.7246193" + fy="2.6743078" + fx="49.011971" + cy="2.6743078" + cx="49.011971" + gradientTransform="matrix(3.733735,0,0,0.454365,-92.79317,-75.69502)" + gradientUnits="userSpaceOnUse" + id="radialGradient3093" + xlink:href="#linearGradient3207" + inkscape:collect="always" /> + <linearGradient + y2="2.3657269" + x2="48.732723" + y1="0.81150496" + x1="48.498562" + gradientTransform="matrix(2.622255,2.657916,-2.649079,2.632636,-5.041617,-125.5286)" + gradientUnits="userSpaceOnUse" + id="linearGradient3090" + xlink:href="#linearGradient3235" + inkscape:collect="always" /> + <radialGradient + r="1.7246193" + fy="2.6743078" + fx="49.011971" + cy="2.6743078" + cx="49.011971" + gradientTransform="matrix(2.47606,0,0,0.454365,-41.74101,-75.81678)" + gradientUnits="userSpaceOnUse" + id="radialGradient3084" + xlink:href="#linearGradient3273" + inkscape:collect="always" /> + <linearGradient + y2="2.395859" + x2="46.051746" + y1="3.0999987" + x1="46.051746" + gradientTransform="matrix(2.878592,0,0,2.879376,112.1874,-63.51627)" + gradientUnits="userSpaceOnUse" + id="linearGradient3081" + xlink:href="#linearGradient3251" + inkscape:collect="always" /> + <radialGradient + r="1.7246193" + fy="2.6743078" + fx="49.011971" + cy="2.6743078" + cx="49.011971" + gradientTransform="matrix(2.456722,0,0,0.454365,-221.4788,-75.89793)" + gradientUnits="userSpaceOnUse" + id="radialGradient3078" + xlink:href="#linearGradient3259" + inkscape:collect="always" /> + <radialGradient + r="7.7031354" + fy="34.191952" + fx="70.903893" + cy="34.191952" + cx="70.903893" + gradientTransform="matrix(1.463988,1.463988,-0.436186,0.436186,-68.3685,-11.42288)" + gradientUnits="userSpaceOnUse" + id="radialGradient3075" + xlink:href="#linearGradient3865" + inkscape:collect="always" /> + <linearGradient + y2="2.3657269" + x2="48.732723" + y1="0.81150496" + x1="48.498562" + gradientTransform="matrix(-2.822275,-2.816377,2.806853,-2.833283,151.623,252.7954)" + gradientUnits="userSpaceOnUse" + id="linearGradient3072" + xlink:href="#linearGradient3235" + inkscape:collect="always" /> + <linearGradient + y2="36.836273" + x2="78.870552" + y1="36.836273" + x1="62.060658" + gradientTransform="matrix(1.898687,0,0,2.125136,-43.30273,-23.91576)" + gradientUnits="userSpaceOnUse" + id="linearGradient3069" + xlink:href="#linearGradient2966" + inkscape:collect="always" /> + <radialGradient + r="1.7246193" + fy="2.7180846" + fx="47.822392" + cy="2.6743078" + cx="49.011971" + gradientTransform="matrix(9.168931,0,0,0.485227,-359.8203,-62.94326)" + gradientUnits="userSpaceOnUse" + id="radialGradient3066" + xlink:href="#linearGradient3273" + inkscape:collect="always" /> + <radialGradient + r="3.9750405" + fy="6.7701697" + fx="47.370888" + cy="8.4953122" + cx="49.009884" + gradientTransform="matrix(3.011442,3.011442,-0.225608,0.219232,-101.1136,-65.93886)" + gradientUnits="userSpaceOnUse" + id="radialGradient3063" + xlink:href="#linearGradient3225" + inkscape:collect="always" /> + <radialGradient + r="3.9750405" + fy="6.7701697" + fx="47.370888" + cy="8.4953122" + cx="49.009884" + gradientTransform="matrix(2.927677,2.927677,-0.225519,0.21932,-98.62494,-60.2183)" + gradientUnits="userSpaceOnUse" + id="radialGradient3060" + xlink:href="#linearGradient3225" + inkscape:collect="always" /> + <radialGradient + r="3.9750405" + fy="6.7701697" + fx="47.370888" + cy="8.4953122" + cx="49.009884" + gradientTransform="matrix(2.77948,2.78745,-0.225681,0.21915,-93.01736,-51.68748)" + gradientUnits="userSpaceOnUse" + id="radialGradient3057" + xlink:href="#linearGradient3225" + inkscape:collect="always" /> + <radialGradient + r="3.9750405" + fy="6.7701697" + fx="47.370888" + cy="8.4953122" + cx="49.009884" + gradientTransform="matrix(2.582895,2.582896,-0.225155,0.219685,-85.0441,-40.01003)" + gradientUnits="userSpaceOnUse" + id="radialGradient3054" + xlink:href="#linearGradient3225" + inkscape:collect="always" /> + <linearGradient + y2="46.891453" + x2="70.085632" + y1="23.19372" + x1="64.79026" + gradientTransform="matrix(1.938808,0,0,1.938808,-46.5436,-46.62102)" + gradientUnits="userSpaceOnUse" + id="linearGradient3051" + xlink:href="#linearGradient3893" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3074"> + <stop + style="stop-color:white;stop-opacity:0.73309606;" + offset="0" + id="stop3076" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3078" /> + </linearGradient> + <linearGradient + id="linearGradient3058"> + <stop + style="stop-color:#9a7600;stop-opacity:1;" + offset="0" + id="stop3060" /> + <stop + id="stop3066" + offset="0.09292036" + style="stop-color:#e3ad00;stop-opacity:1;" /> + <stop + style="stop-color:#ffcd2c;stop-opacity:1;" + offset="0.5043171" + id="stop3070" /> + <stop + style="stop-color:#e3ad00;stop-opacity:1;" + offset="0.91571385" + id="stop3068" /> + <stop + style="stop-color:#b98d00;stop-opacity:1;" + offset="1" + id="stop3062" /> + </linearGradient> + <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.197802,0,92.82166)" - cx="63.912209" + r="63.912209" + fy="135.33501" + fx="28.865602" cy="115.70919" - fx="63.912209" - fy="115.7093" - r="63.912209" /> + cx="63.912209" + id="radialGradient3297" + xlink:href="#linearGradient3291" + inkscape:collect="always" /> <linearGradient - id="linearGradient3075"> + id="linearGradient3207"> <stop - id="stop3077" + id="stop3209" offset="0" style="stop-color:#ffffff;stop-opacity:1;" /> <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0.42597079" - id="stop3093" /> - <stop - style="stop-color:#f1f1f1;stop-opacity:1;" - offset="0.5892781" - id="stop3085" /> - <stop - id="stop3087" - offset="0.80219781" - style="stop-color:#eaeaea;stop-opacity:1;" /> - <stop - id="stop3079" + id="stop3211" offset="1" - style="stop-color:#dfdfdf;stop-opacity:1;" /> + style="stop-color:#252525;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3235" + inkscape:collect="always"> + <stop + id="stop3237" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop3239" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3251"> + <stop + id="stop3253" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3255" + offset="1" + style="stop-color:#131313;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3259"> + <stop + style="stop-color:#ffffff;stop-opacity:0.55035973;" + offset="0" + id="stop3261" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3263" /> + </linearGradient> + <linearGradient + id="linearGradient3273"> + <stop + id="stop3275" + offset="0" + style="stop-color:white;stop-opacity:0.88086641;" /> + <stop + id="stop3277" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3303"> + <stop + id="stop3305" + offset="0" + style="stop-color:#ffffff;stop-opacity:0.68345326;" /> + <stop + id="stop3307" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2598"> + <stop + id="stop2600" + offset="0" + style="stop-color:#252525;stop-opacity:1;" /> + <stop + style="stop-color:#252525;stop-opacity:1;" + offset="0.5" + id="stop2606" /> + <stop + id="stop2608" + offset="0.75" + style="stop-color:#252525;stop-opacity:1;" /> + <stop + id="stop2602" + offset="1" + style="stop-color:#000000;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient2966"> + <stop + id="stop2968" + offset="0" + style="stop-color:#8b9084;stop-opacity:1;" /> + <stop + style="stop-color:#cacdc7;stop-opacity:1;" + offset="0.08241758" + id="stop2974" /> + <stop + id="stop2978" + offset="0.20341745" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop2976" + offset="0.87744886" + style="stop-color:#d6d6d6;stop-opacity:1;" /> + <stop + id="stop2970" + offset="1" + style="stop-color:#8c9185;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3865"> + <stop + id="stop3867" + offset="0" + style="stop-color:#ecedeb;stop-opacity:1;" /> + <stop + style="stop-color:#e9eae7;stop-opacity:1;" + offset="0.5" + id="stop3873" /> + <stop + id="stop3869" + offset="1" + style="stop-color:#babdb6;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3893" + inkscape:collect="always"> + <stop + id="stop3895" + offset="0" + style="stop-color:#2e3436;stop-opacity:1;" /> + <stop + id="stop3897" + offset="1" + style="stop-color:#2e3436;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient3972"> + <stop + style="stop-color:#af4e4e;stop-opacity:1;" + offset="0" + id="stop3974" /> + <stop + style="stop-color:#581f1f;stop-opacity:1;" + offset="1" + id="stop3976" /> </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3075" - id="radialGradient5042" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.481994,-6.068637e-2,7.102776e-2,3.533395,189.4854,-263.967)" - cx="-25" - cy="106.49996" - fx="-25" - fy="106.49996" - r="45" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3075" - id="radialGradient5956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.481994,-6.068637e-2,7.102776e-2,3.533395,189.4854,-259.967)" - cx="-25" - cy="106.49996" - fx="-25" - fy="106.49996" - r="45" /> </defs> <sodipodi:namedview id="base" @@ -98,26 +847,24 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284271" - inkscape:cx="61.351822" - inkscape:cy="51.02423" + inkscape:zoom="0.86143114" + inkscape:cx="379.46559" + inkscape:cy="-52.196482" inkscape:current-layer="layer1" - showgrid="true" + showgrid="false" inkscape:document-units="px" inkscape:grid-bbox="true" - guidetolerance="0.1px" showguides="true" inkscape:guide-bbox="true" - inkscape:window-width="1018" - inkscape:window-height="694" - inkscape:window-x="0" - inkscape:window-y="0" - width="128px" - height="128px" - gridempspacing="0" - gridspacingx="4px" - gridspacingy="4px" - inkscape:grid-points="true" /> + inkscape:window-width="1270" + inkscape:window-height="731" + inkscape:window-x="54" + inkscape:window-y="283"> + <sodipodi:guide + orientation="horizontal" + position="88.703233" + id="guide3188" /> + </sodipodi:namedview> <metadata id="metadata1312"> <rdf:RDF> @@ -126,215 +873,299 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <cc:license - rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> - <dc:contributor> - <cc:Agent> - <dc:title>Oxygen team</dc:title> - </cc:Agent> - </dc:contributor> </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/LGPL/2.1/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" /> - </cc:License> </rdf:RDF> </metadata> <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> + <g + id="g3268" + transform="translate(253.643,-88.65193)"> + <circle + transform="matrix(-1.532253,0.874618,-0.874618,-1.532253,-35.5852,191.5738)" + cx="93.004997" + cy="70.773003" + r="5.9920001" + id="circle76" + sodipodi:cx="93.004997" + sodipodi:cy="70.773003" + sodipodi:rx="5.9920001" + sodipodi:ry="5.9920001" + style="opacity:0.7;fill:#9f0" /> + <path + d="M -127.44273,167.76473 C -128.9816,173.39681 -134.79957,176.71773 -140.43318,175.17974 C -146.06044,173.64218 -149.38137,167.82422 -147.84404,162.19302 C -146.30517,156.56094 -140.4872,153.24001 -134.85687,154.77582 C -129.22457,156.31862 -125.90606,162.13593 -127.44273,167.76473 z " + id="path78" + style="opacity:0.7;fill:red" /> + <path + d="M -229.65665,139.84174 C -231.19727,145.47075 -237.01282,148.79233 -242.6425,147.25412 C -248.27611,145.71613 -251.5955,139.89729 -250.05663,134.26521 C -248.51842,128.63554 -242.70199,125.31549 -237.06925,126.85195 C -231.43871,128.39169 -228.11778,134.20966 -229.65665,139.84174 z " + id="path80" + style="opacity:0.7;fill:#0c0" /> + <path + d="M -134.82273,147.77816 C -140.46979,149.26664 -146.25134,145.88928 -147.7359,140.24199 C -149.2189,134.59383 -145.84307,128.81315 -140.19557,127.33255 C -134.54608,125.84472 -128.76387,129.21968 -127.28371,134.87353 C -125.79917,140.52081 -129.17522,146.29755 -134.82273,147.77816 z " + id="path82" + style="opacity:0.7;fill:#c09" /> + <path + d="M -218.58915,120.88646 C -222.73756,124.99335 -229.43235,124.96307 -233.54033,120.80918 C -237.64962,116.66012 -237.61671,109.96992 -233.47224,105.86325 C -229.32033,101.74827 -222.62598,101.7849 -218.51669,105.93397 C -214.40586,110.08216 -214.43942,116.77476 -218.58915,120.88646 z " + id="path84" + style="opacity:0.7;fill:#099" /> + <path + d="M -143.6654,121.25016 C -147.81774,125.35726 -154.50772,125.32829 -158.61877,121.17616 C -162.72631,117.03016 -162.69296,110.33362 -158.53996,106.22411 C -154.39308,102.1181 -147.70223,102.1486 -143.59534,106.297 C -139.47882,110.44804 -139.51217,117.14459 -143.6654,121.25016 z " + id="path86" + style="opacity:0.7;fill:#609" /> + <circle + transform="matrix(-1.532253,0.874618,-0.874618,-1.532253,-35.5852,191.5738)" + cx="56.226002" + cy="92.004997" + r="5.993" + id="circle88" + sodipodi:cx="56.226002" + sodipodi:cy="92.004997" + sodipodi:rx="5.993" + sodipodi:ry="5.993" + style="opacity:0.7;fill:#03c" /> + <path + d="M -164.58338,102.69759 C -166.12313,108.32814 -171.94197,111.64753 -177.5723,110.11173 C -183.20284,108.57199 -186.52377,102.75402 -184.98643,97.122815 C -183.44669,91.492267 -177.62873,88.171343 -171.99752,89.708678 C -166.36851,91.249294 -163.04605,97.066388 -164.58338,102.69759 z " + id="path90" + style="opacity:0.7;fill:#309" /> + <path + d="M -134.856,154.77735 C -140.48633,153.24155 -146.3043,156.56247 -147.84316,162.19455 C -149.38049,167.82575 -146.05957,173.64372 -140.43231,175.18127 C -134.7987,176.71926 -128.98073,173.39834 -127.44186,167.76626 C -125.90606,162.13593 -129.22457,156.31862 -134.856,154.77735 z " + id="path92" + style="opacity:0.7;fill:none" /> + <path + d="M -140.19557,127.33255 C -145.84373,128.81556 -149.2189,134.59383 -147.7359,140.24199 C -146.24981,145.8884 -140.46979,149.26664 -134.82273,147.77816 C -129.1761,146.29602 -125.79917,140.52081 -127.28371,134.87353 C -128.76387,129.21968 -134.54608,125.84472 -140.19557,127.33255 z " + id="path94" + style="opacity:0.7;fill:none" /> + <circle + transform="matrix(-1.532253,0.874618,-0.874618,-1.532253,-35.5852,191.5738)" + cx="34.993" + cy="70.773003" + r="5.9920001" + id="circle96" + sodipodi:cx="34.993" + sodipodi:cy="70.773003" + sodipodi:rx="5.9920001" + sodipodi:ry="5.9920001" + style="opacity:0.7;fill:none" /> + <path + d="M -184.98643,97.122815 C -186.52377,102.75402 -183.20284,108.57199 -177.5723,110.11173 C -171.94197,111.64753 -166.12313,108.32814 -164.58338,102.69759 C -163.04452,97.065514 -166.36851,91.249294 -171.99752,89.708678 C -177.62873,88.171343 -183.44669,91.492267 -184.98643,97.122815 z " + id="path98" + style="opacity:0.7;fill:none" /> + <circle + transform="matrix(-1.532253,0.874618,-0.874618,-1.532253,-35.5852,191.5738)" + cx="56.228001" + cy="92.005997" + r="5.9920001" + id="circle100" + sodipodi:cx="56.228001" + sodipodi:cy="92.005997" + sodipodi:rx="5.9920001" + sodipodi:ry="5.9920001" + style="opacity:0.7;fill:none" /> + </g> + <path + style="fill:url(#radialGradient3326);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#radialGradient3334);stroke-width:2.152;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.37704918;stroke-miterlimit:4;stroke-dasharray:none" + d="M 15.373706,125.69402 C 22.221465,125.74933 27.996107,124.98911 29.405976,125.0239 C 38.732442,125.25394 61.077222,120.9265 52.141073,115.60666 C 42.378446,109.79479 15.545252,109.95091 5.0973772,115.55487 C -6.3045902,121.67058 8.5270618,125.63869 15.373706,125.69402 z " + id="path3336" + sodipodi:nodetypes="csssz" /> <path sodipodi:type="arc" - style="opacity:0.38139535;fill:url(#radialGradient4000);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="path3289" - sodipodi:cx="63.912209" - sodipodi:cy="115.70919" - sodipodi:rx="63.912209" - sodipodi:ry="12.641975" - d="M 127.82442 115.70919 A 63.912209 12.641975 0 1 1 0,115.70919 A 63.912209 12.641975 0 1 1 127.82442 115.70919 z" - transform="matrix(0.900696,0,0,0.375288,6.434529,79.83135)" /> - <path - sodipodi:nodetypes="ccc" - id="path2276" - d="M 50.892799,3.2812959 L 50.892799,0.48658747 L 50.892799,3.2812959 z " - style="fill:white;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccc" - id="path3206" - d="M -68.609401,-83.348954 L -68.609401,-86.143663 L -68.609401,-83.348954 z " - style="fill:white;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> - <g - id="layer4" - inkscape:label="box" - style="display:inline" - transform="translate(114.3422,61.23268)" /> - <g - id="layer5" - inkscape:label="zip_app" - style="display:inline" - transform="translate(114.3422,61.23268)" /> - <path - sodipodi:nodetypes="ccc" - id="path3946" - d="M 177.982,-17.593684 L 177.982,-20.388393 L 177.982,-17.593684 z " - style="fill:white;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> - <path - sodipodi:nodetypes="ccc" - id="path1561" - d="M 85.357554,56.299996 L 85.357554,54.77326 L 85.357554,56.299996 z " - style="fill:white;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> + style="opacity:0.3647541;fill:url(#radialGradient8823);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" + id="path8815" + sodipodi:cx="63.84724" + sodipodi:cy="121.47017" + sodipodi:rx="63.84724" + sodipodi:ry="6.5298314" + d="M 127.69448 121.47017 A 63.84724 6.5298314 0 1 1 0,121.47017 A 63.84724 6.5298314 0 1 1 127.69448 121.47017 z" /> <rect - style="opacity:0.57786889;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.63199997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + style="opacity:0.57786889;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.63199997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" id="rect1327" width="1" height="0" - x="27.87281" - y="-0.29999" /> + x="116" + y="77" /> <rect style="opacity:0.57786889;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.63199997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="rect2482" + id="rect2306" width="1" height="0" - x="-7.2540002" - y="-27.8276" /> + x="-141.37" + y="33.53812" /> <path sodipodi:nodetypes="ccc" - id="path2494" - d="M -166.19142,-101.04367 L -166.19142,-103.83838 L -166.19142,-101.04367 z " + id="path2318" + d="M -300.30742,-39.677947 L -300.30742,-42.472656 L -300.30742,-39.677947 z " style="fill:white;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> <g style="opacity:0.40163933" - transform="matrix(-0.782995,0,0,0.650879,-2489.05,585.474)" + transform="matrix(-0.782995,0,0,0.650879,-2623.166,646.8397)" id="g4640" /> <g id="g4646" - transform="matrix(-0.782995,0,0,0.650879,-2489.05,585.474)" + transform="matrix(-0.782995,0,0,0.650879,-2623.166,646.8397)" style="opacity:0.40163933" /> <g id="g4730" - transform="matrix(1,0,0,0.650879,711.913,592.8018)" + transform="matrix(1,0,0,0.650879,577.797,654.1675)" style="opacity:0.40163933" /> <g style="opacity:0.40163933" - transform="matrix(1,0,0,0.650879,711.913,592.8018)" + transform="matrix(1,0,0,0.650879,577.797,654.1675)" id="g4748" /> <path - id="path5940" - d="M 20,8 L 20,120 L 112,119.95189 L 112,8 L 20,8 z " - style="opacity:0.1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + style="opacity:0.25;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:2.97746849;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" + d="M 86.083219,14.267693 C 90.982146,22.989826 116.60724,68.613371 121.50614,77.335505 C 126.40506,86.057641 115.66144,101.33267 97.519324,111.43471 C 79.377185,121.53674 60.681769,122.65416 55.782853,113.93203 C 50.883948,105.20991 25.258851,59.586353 20.359921,50.864221 C 15.461006,42.142093 26.20462,26.867057 44.346764,16.765024 C 62.48889,6.6629851 81.184323,5.5455518 86.083219,14.267693 z " + id="path7759" + sodipodi:nodetypes="ccssccs" /> + <path + sodipodi:nodetypes="ccssccs" + id="path7757" + d="M 86.083219,14.267693 C 90.982146,22.989826 116.60724,68.613371 121.50614,77.335505 C 126.40506,86.057641 115.66144,101.33267 97.519324,111.43471 C 79.377185,121.53674 60.681769,122.65416 55.782853,113.93203 C 50.883948,105.20991 25.258851,59.586353 20.359921,50.864221 C 15.461006,42.142093 26.20462,26.867057 44.346764,16.765024 C 62.48889,6.6629851 81.184323,5.5455518 86.083219,14.267693 z " + style="opacity:0.3;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.98497915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" /> + <path + style="fill:url(#linearGradient8859);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 86.078581,13.960252 C 90.977509,22.682386 116.60259,68.305936 121.5015,77.028069 C 126.40042,85.7502 115.65681,101.02523 97.51468,111.12727 C 79.372541,121.2293 60.677125,122.34672 55.778208,113.62459 C 50.879303,104.90247 25.254207,59.278915 20.355278,50.556784 C 15.456362,41.834655 26.199976,26.559619 44.34212,16.457586 C 62.484247,6.3555484 81.179667,5.2381215 86.078581,13.960252 z " + id="path3115" + sodipodi:nodetypes="ccssccs" /> + <path + style="opacity:0.40573772;fill:url(#radialGradient8856);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 86.078581,13.960252 C 90.977509,22.682386 116.60259,68.305936 121.5015,77.028069 C 126.40042,85.7502 115.65681,101.02523 97.51468,111.12727 C 79.372541,121.2293 60.677125,122.34672 55.778208,113.62459 C 50.879303,104.90247 25.254207,59.278915 20.355278,50.556784 C 15.456362,41.834655 26.199976,26.559619 44.34212,16.457586 C 62.484247,6.3555484 81.179667,5.2381215 86.078581,13.960252 z " + id="path5889" + sodipodi:nodetypes="ccssccs" /> + <path + sodipodi:nodetypes="ccssccs" + id="path3139" + d="M 86.078581,13.960252 C 90.977509,22.682386 116.60259,68.305936 121.5015,77.028069 C 126.40042,85.7502 115.65681,101.02523 97.51468,111.12727 C 79.372541,121.2293 60.677125,122.34672 55.778208,113.62459 C 50.879303,104.90247 25.254207,59.278915 20.355278,50.556784 C 15.456362,41.834655 26.199976,26.559619 44.34212,16.457586 C 62.484247,6.3555484 81.179667,5.2381215 86.078581,13.960252 z " + style="fill:url(#linearGradient8853);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> + <path + transform="matrix(0.981188,-0.546351,0.371618,0.661637,152.2798,-63.94088)" + d="M -84.361111 47.980999 A 33.496326 23.881639 0 1 1 -151.35376,47.980999 A 33.496326 23.881639 0 1 1 -84.361111 47.980999 z" + sodipodi:ry="23.881639" + sodipodi:rx="33.496326" + sodipodi:cy="47.980999" + sodipodi:cx="-117.85744" + id="path4993" + style="opacity:0.4;fill:url(#linearGradient7831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:0.4;fill:url(#linearGradient7829);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + id="path2223" + sodipodi:cx="-117.85744" + sodipodi:cy="47.980999" + sodipodi:rx="33.496326" + sodipodi:ry="23.881639" + d="M -84.361111 47.980999 A 33.496326 23.881639 0 1 1 -151.35376,47.980999 A 33.496326 23.881639 0 1 1 -84.361111 47.980999 z" + transform="matrix(0.981188,-0.546351,0.371618,0.661637,151.317,-64.04474)" /> + <path + sodipodi:type="arc" + style="opacity:0.4;fill:url(#linearGradient7833);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + id="path4997" + sodipodi:cx="-117.85744" + sodipodi:cy="47.980999" + sodipodi:rx="33.496326" + sodipodi:ry="23.881639" + d="M -84.361111 47.980999 A 33.496326 23.881639 0 1 1 -151.35376,47.980999 A 33.496326 23.881639 0 1 1 -84.361111 47.980999 z" + transform="matrix(0.981188,-0.546351,0.371618,0.661637,151.317,-64.04474)" /> + <path + style="fill:#cacaca;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26253247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 86.175314,14.144517 C 86.475057,14.678203 87.55732,16.579153 87.77727,16.970747 C 92.676184,25.692881 81.948403,40.961508 63.806273,51.063549 C 45.664134,61.165582 26.985228,62.291835 22.086312,53.569703 C 21.821534,53.09829 20.556409,50.832023 20.17709,50.156664 C 20.302759,51.53979 20.667326,52.819427 21.331333,54.001619 C 23.869791,58.521165 29.999318,60.465561 37.708336,60.003876 C 45.417353,59.542191 54.778498,56.681876 63.969032,51.564344 C 73.159564,46.446804 80.495952,40.042554 84.926834,33.744415 C 89.357715,27.446273 90.867227,21.231023 88.328757,16.711473 C 87.775376,15.726211 87.047974,14.885201 86.175314,14.144517 z " + id="path3169" /> + <path + style="opacity:0.4;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 76.720644,9.4460895 C 68.451582,8.5326382 56.884239,11.342217 45.5454,17.655979 C 27.40325,27.757994 16.651051,43.048951 21.54996,51.771077 C 21.917528,52.425505 22.381548,53.003213 22.898445,53.547195 C 22.630229,53.201021 22.377227,52.860819 22.161368,52.476506 C 17.262459,43.754379 28.014658,28.463424 46.156808,18.361408 C 62.930237,9.021524 80.173451,7.3604041 86.552512,14.056021 C 84.536777,11.462824 81.092827,9.9290726 76.720644,9.4460895 z " + id="path4984" /> + <path + style="fill:url(#linearGradient8845);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 59.474254,68.01234 L 84.311353,109.91412 C 99.162287,103.24193 116.63784,87.654203 119.47193,77.30627 L 95.280709,34.66616 C 92.294699,49.841373 74.123308,61.005415 59.474254,68.01234 z " + id="rect5907" sodipodi:nodetypes="ccccc" /> + <path + transform="matrix(0.979816,-0.546512,0.371116,0.661595,151.1312,-64.06692)" + d="M -84.361111 47.980999 A 33.496326 23.881639 0 1 1 -151.35376,47.980999 A 33.496326 23.881639 0 1 1 -84.361111 47.980999 z" + sodipodi:ry="23.881639" + sodipodi:rx="33.496326" + sodipodi:cy="47.980999" + sodipodi:cx="-117.85744" + id="path6842" + style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:white;stroke-width:1.61265159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + sodipodi:type="arc" /> + <path + id="path3195" + d="M 19.565592,44.078709 C 19.288776,46.403518 19.590769,48.563442 20.594456,50.40688 C 25.333978,59.111806 42.91558,56.965501 60.935012,47.738444 C 65.753411,45.271127 69.734007,42.294395 70.783046,41.418568 C 63.272761,36.704129 22.341746,32.476069 19.565592,44.078709 z " + style="fill:#b70000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + sodipodi:nodetypes="csscc" /> + <path + style="fill:black;fill-opacity:0.39430895;fill-rule:nonzero;stroke:none;stroke-width:1.61265159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" + d="M 75.919406,8.2675994 C 74.320253,8.0939605 72.588836,8.0790803 70.751748,8.1895351 C 63.403405,8.6313552 54.398947,11.366976 45.492948,16.334479 C 36.586946,21.301981 29.520496,27.517878 25.297036,33.530466 C 24.374665,34.843567 23.59643,36.159655 22.952983,37.433947 C 23.540271,36.333747 24.243547,35.237077 25.035447,34.109717 C 29.258907,28.097124 36.324874,21.849207 45.230873,16.881704 C 54.136872,11.914197 63.141332,9.1785799 70.489675,8.73676 C 77.838021,8.2949399 83.499653,10.102715 85.832254,14.261084 C 87.435913,17.119966 87.284948,20.759426 85.659471,24.697466 C 87.505548,20.544143 87.773385,16.707153 86.094329,13.713858 C 84.344873,10.595082 80.716865,8.788514 75.919406,8.2675994 z M 86.407192,26.472699 C 85.785148,27.645127 85.041981,28.820523 84.207772,30.008113 C 79.758661,36.341934 72.422381,42.779564 63.211609,47.917062 C 54.000838,53.054555 44.647485,55.931289 36.906546,56.396717 C 29.165605,56.862143 23.004169,54.89915 20.444473,50.335942 C 18.684682,47.198737 18.870727,43.246366 20.604189,39.034893 C 18.643396,43.465027 18.341834,47.601961 20.1824,50.883167 C 22.742095,55.446376 28.903533,57.409368 36.644473,56.943942 C 44.385414,56.478519 53.738765,53.60178 62.949536,48.464287 C 72.160309,43.326789 79.497071,36.921185 83.946177,30.587366 C 84.910672,29.214295 85.727951,27.823233 86.407192,26.472699 z " + id="path7732" /> + <path + style="fill:black;fill-opacity:0.39430895;fill-rule:nonzero;stroke:none;stroke-width:1.61265159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" + d="M 76.45258,8.034723 C 74.853426,7.8610862 73.121523,7.8141826 71.284436,7.9246385 C 63.936093,8.3664564 54.931635,11.102077 46.025636,16.069581 C 40.328465,19.247293 35.402082,22.950542 31.468899,26.776195 C 35.262051,23.229267 39.917929,19.839766 45.226838,16.878612 C 54.132839,11.911107 63.137298,9.1754884 70.48564,8.7336675 C 77.833983,8.2918506 83.608776,10.126815 85.799716,14.359895 C 87.883765,18.386465 86.26675,24.142969 82.043292,30.155557 C 80.57677,32.243327 78.930802,34.179742 76.82328,36.256397 C 79.289659,33.923302 81.186224,31.703848 82.842089,29.346525 C 87.065555,23.333932 88.864495,17.838996 86.531881,13.680627 C 84.782426,10.561854 81.250039,8.5556375 76.45258,8.034723 z M 29.784526,26.626405 C 27.354559,28.961544 25.252279,31.351425 23.583864,33.726609 C 19.134755,40.060428 17.588583,46.313624 20.148278,50.876829 C 22.707973,55.440042 28.86941,57.403031 36.610351,56.937603 C 44.35129,56.472176 53.73473,53.598689 62.945501,48.461195 C 69.100494,45.028116 74.391831,41.018834 78.569877,36.846668 C 74.525505,40.727509 69.501033,44.441229 63.744298,47.652163 C 54.533525,52.789658 45.180659,55.698417 37.439719,56.163843 C 29.698778,56.62927 23.536855,54.634248 20.977162,50.071044 C 18.417466,45.507829 19.963638,39.254652 24.412746,32.920824 C 25.890023,30.817749 27.705241,28.704992 29.784526,26.626405 z " + id="path7745" + sodipodi:nodetypes="csscsssscssccsssscssssc" /> <path sodipodi:nodetypes="ccccc" - style="opacity:0.15;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - d="M 20,8 L 20,120 L 112,119.95189 L 112,8 L 20,8 z " - id="path5938" /> + id="path1957" + d="M 59.474254,68.01234 L 84.311353,109.91412 C 99.16229,103.24193 116.63784,87.654203 119.47193,77.30627 L 95.28071,34.66616 C 92.2947,49.841373 74.123308,61.005415 59.474254,68.01234 z " + style="fill:url(#radialGradient2853);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> <path - id="path5936" - d="M 20,8 L 20,120 L 112,119.95189 L 112,8 L 20,8 z " - style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - sodipodi:nodetypes="ccccc" /> + id="path8825" + d="M 120.02654,75.206335 C 120.32266,75.733559 121.39183,77.6115 121.60911,77.998357 C 126.44873,86.614931 115.85079,101.69876 97.928243,111.67853 C 80.005674,121.65831 61.552839,122.77092 56.713214,114.15435 C 56.451639,113.68864 55.201826,111.4498 54.8271,110.78262 C 54.951247,112.14901 55.311402,113.41316 55.967372,114.58104 C 58.475106,119.04589 64.53045,120.96675 72.146166,120.51066 C 79.761882,120.05454 89.00973,117.22886 98.089034,112.17327 C 107.16832,107.11767 114.41592,100.79093 118.79317,94.569017 C 123.17043,88.347104 124.66168,82.207073 122.15393,77.742226 C 121.60724,76.768888 120.88864,75.938059 120.02654,75.206335 z " + style="opacity:0.78278689;fill:url(#linearGradient8872);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26253247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> <path - sodipodi:nodetypes="ccccc" - style="opacity:0.25;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - d="M 20,8 L 20,120 L 112,119.95189 L 112,8 L 20,8 z " - id="path5049" /> + style="opacity:0.78278689;fill:url(#linearGradient8870);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26253247;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 119.58033,74.691495 C 119.87645,75.218718 120.9456,77.096666 121.16289,77.483521 C 126.00251,86.10009 115.40457,101.18392 97.482022,111.1637 C 79.559453,121.14345 61.106618,122.25609 56.266992,113.6395 C 56.005419,113.1738 54.755605,110.93497 54.380878,110.26779 C 54.505026,111.63417 54.865181,112.89832 55.521152,114.0662 C 58.028884,118.53105 64.084228,120.45191 71.699944,119.99581 C 79.315661,119.53971 88.563508,116.71402 97.642812,111.65843 C 106.7221,106.60283 113.9697,100.27609 118.34695,94.054178 C 122.72421,87.832263 124.21545,81.692233 121.7077,77.227385 C 121.16102,76.254047 120.44241,75.423219 119.58033,74.691495 z " + id="path8827" /> <path - id="path1448" - d="M 20,8 L 20,120 L 112,119.95189 L 112,8 L 20,8 z " - style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.63199997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - sodipodi:nodetypes="ccccc" /> + style="fill:#b90000;fill-opacity:1;fill-rule:evenodd;stroke:#ae0000;stroke-width:0.75208664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 15.373706,125.69402 C 22.221465,125.74933 27.996107,124.98911 29.405976,125.0239 C 38.732442,125.25394 61.077222,120.9265 52.141073,115.60666 C 42.378446,109.79479 15.545252,109.95091 5.0973772,115.55487 C -6.3045902,121.67058 8.5270618,125.63869 15.373706,125.69402 z " + id="path7755" + sodipodi:nodetypes="csssz" /> <path - id="path1450" - d="M 22,10 L 22,117.85657 L 75.191782,117.85657 L 110,118 L 110,10 L 22,10 z " - style="fill:url(#radialGradient5956);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.63199997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - sodipodi:nodetypes="cccccc" /> - <rect - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="rect2835" - width="68" - height="4" - x="32" - y="20" - rx="1.3577917" - ry="0" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/rect3746.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - ry="0" - rx="1.3577914" - y="36" - x="32" - height="4" - width="68" - id="rect3722" - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/rect3746.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="rect3724" - width="28" - height="4" - x="72" - y="100" - rx="0.55909067" - ry="0" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/rect3746.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="rect3746" - width="28" - height="4" - x="72" - y="84" - rx="0.55909061" - ry="0" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/rect3746.png" - ry="0" - rx="0.55909067" - y="52" - x="72" - height="4" - width="28" - id="rect1913" - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" /> - <rect - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/pinheiro/artwork/Oxygen/theme/svg/actions/small/22x22/rect3746.png" - style="opacity:0.7;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" - id="rect1915" - width="28" - height="4" - x="72" - y="68" - rx="0.55909055" - ry="0" /> + sodipodi:nodetypes="csssz" + id="path7898" + d="M 15.322403,126.05314 C 22.170162,126.10845 27.970817,125.31015 29.380324,125.35737 C 38.792057,125.67268 61.866384,121.20263 52.397589,115.35014 C 42.733011,109.37665 15.545252,109.43788 4.7382546,115.34966 C -6.6129262,121.55912 8.4757588,125.99781 15.322403,126.05314 z " + style="opacity:0.88524631;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3300);stroke-width:0.077;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> <path - sodipodi:nodetypes="cccccccccc" - id="polygon3477_2_" - d="M 40,99.999997 L 44,104.00001 L 68,80 L 44,56 L 40,60 L 52,76 L 24,76 L 24,84 L 52,84 L 40,99.999997 z " - style="fill:#6193cf;fill-opacity:1" /> + style="opacity:0.43852461;fill:url(#linearGradient2863);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 84.311353,109.91412 C 99.16229,103.24193 116.63784,87.654203 119.47193,77.30627 C 102.01223,47.067434 69.038917,83.579128 84.311353,109.91412 z " + id="path2855" + sodipodi:nodetypes="ccc" /> + <path + style="fill:#b70000;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 35.982327,55.747756 C 30.24759,55.610605 28.138458,60.217287 27.770194,64.698563 C 26.66944,78.09325 28.964887,87.482904 28.19733,98.200061 C 28.041652,100.37373 24.172951,102.55924 23.718245,97.716715 C 22.663064,86.479259 24.45652,78.593727 23.194951,63.072112 C 22.778256,57.945329 21.204723,53.02035 19.824349,47.15959" + id="path3206" + sodipodi:nodetypes="cssssc" /> + <path + id="path7908" + d="M 21.433229,51.631602 C 22.53314,55.958153 23.57408,59.862763 23.901213,63.887634 C 25.162782,79.409249 23.369419,87.300957 24.4246,98.538416 C 24.485175,99.183527 24.613871,99.699016 24.778773,100.11132 C 25.219997,99.66035 25.523756,99.084185 25.565476,98.501666 C 26.333034,87.784509 23.960684,78.526563 25.061439,65.131876 C 25.349519,61.626317 26.576317,57.04092 29.940801,56.066652 C 27.094194,54.590064 24.165433,53.167693 21.433229,51.631602 z " + style="fill:url(#radialGradient8832);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="csscc" + style="fill:url(#linearGradient3292);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" + d="M 19.565592,44.078709 C 19.288776,46.403518 19.590769,48.563442 20.594456,50.40688 C 25.333978,59.111806 42.91558,56.965501 60.935012,47.738444 C 65.753411,45.271127 69.734007,42.294395 70.783046,41.418568 C 63.272761,36.704129 22.341746,32.476069 19.565592,44.078709 z " + id="path3284" /> + <path + style="opacity:0.62704918;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3300);stroke-width:0.277;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 15.322403,126.05314 C 22.170162,126.10845 27.970817,125.31015 29.380324,125.35737 C 38.792057,125.67268 61.789429,121.27958 52.320634,115.42709 C 42.656056,109.4536 15.596555,109.52766 4.7895578,115.43944 C -6.561623,121.6489 8.4757588,125.99781 15.322403,126.05314 z " + id="path3302" + sodipodi:nodetypes="csssz" /> + <path + sodipodi:nodetypes="csssz" + id="path3304" + d="M 15.322403,126.05314 C 22.170162,126.10845 27.970817,125.31015 29.380324,125.35737 C 38.792057,125.67268 61.614702,121.54762 52.121111,115.73544 C 42.48653,109.83694 15.743585,109.91337 4.8983883,115.72965 C -6.5039231,121.84472 8.4757588,125.99781 15.322403,126.05314 z " + style="opacity:0.24590164;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3300);stroke-width:0.977;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + style="opacity:0.81967213;fill:url(#linearGradient3308);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:0.33333333" + d="M 32.370811,111.10281 C 24.46055,110.80473 16.101856,111.59262 9.9856963,113.39865 C 6.8510105,116.25766 18.543637,119.04089 27.148238,119.25315 C 36.932041,119.4945 48.007666,116.69496 46.063756,112.96395 C 42.119175,111.91527 37.350585,111.29046 32.370811,111.10281 z " + id="path7853" + sodipodi:nodetypes="ccscc" /> + <path + sodipodi:nodetypes="csssz" + id="path3310" + d="M 15.373706,125.69402 C 22.221465,125.74933 27.996107,124.98911 29.405976,125.0239 C 38.732442,125.25394 61.077222,120.9265 52.141073,115.60666 C 42.378446,109.79479 15.545252,109.95091 5.0973772,115.55487 C -6.3045902,121.67058 8.5270618,125.63869 15.373706,125.69402 z " + style="fill:url(#radialGradient3326);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#radialGradient3334);stroke-width:0.75208664px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.70081967" /> </g> </svg> diff --git a/resources/images/lookfeel.png b/resources/images/lookfeel.png index 4d3690bf8dd28f752030db345d28e2741c92330e..7da9f08e64b4e124debf3a23df0e11cb0668ea37 100644 GIT binary patch literal 16529 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 delta 2484 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 From 028dbbcf9b42fe5fec111536eeb32113d64d2776 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Thu, 30 Sep 2010 23:51:19 -0600 Subject: [PATCH 233/235] Bulk downloading of metadata/covers now shows progress and can be canceled --- src/calibre/gui2/actions/edit_metadata.py | 47 ++--- src/calibre/gui2/metadata.py | 223 ++++++++++++++++++---- 2 files changed, 192 insertions(+), 78 deletions(-) diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 851528f2e0..2a81a1500d 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -8,15 +8,14 @@ __docformat__ = 'restructuredtext en' import os from functools import partial -from PyQt4.Qt import Qt, QTimer, QMenu +from PyQt4.Qt import Qt, QMenu -from calibre.gui2 import error_dialog, config, warning_dialog +from calibre.gui2 import error_dialog, config from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog from calibre.gui2.dialogs.confirm_delete import confirm from calibre.gui2.dialogs.tag_list_editor import TagListEditor from calibre.gui2.actions import InterfaceAction -from calibre.gui2.dialogs.progress import BlockingBusy class EditMetadataAction(InterfaceAction): @@ -90,51 +89,27 @@ class EditMetadataAction(InterfaceAction): get_social_metadata = config['get_social_metadata'] else: get_social_metadata = set_social_metadata - from calibre.gui2.metadata import DownloadMetadata - self._download_book_metadata = DownloadMetadata(db, ids, + from calibre.gui2.metadata import DoDownload + if set_social_metadata is not None and set_social_metadata: + x = _('social metadata') + else: + x = _('covers') if covers and not set_metadata else _('metadata') + title = _('Downloading %s for %d book(s)')%(x, len(ids)) + self._download_book_metadata = DoDownload(self.gui, title, db, ids, get_covers=covers, set_metadata=set_metadata, get_social_metadata=get_social_metadata) m.stop_metadata_backup() try: - self._download_book_metadata.start() - if set_social_metadata is not None and set_social_metadata: - x = _('social metadata') - else: - x = _('covers') if covers and not set_metadata else _('metadata') - self._book_metadata_download_check = QTimer(self.gui) - self._book_metadata_download_check.timeout.connect(self.book_metadata_download_check, - type=Qt.QueuedConnection) - self._book_metadata_download_check.start(100) - self._bb_dialog = BlockingBusy(_('Downloading %s for %d book(s)')%(x, - len(ids)), parent=self.gui) - self._bb_dialog.exec_() + self._download_book_metadata.exec_() finally: m.start_metadata_backup() - - def book_metadata_download_check(self): - if self._download_book_metadata.is_alive(): - return - self._book_metadata_download_check.stop() - self._bb_dialog.accept() cr = self.gui.library_view.currentIndex().row() x = self._download_book_metadata - self._download_book_metadata = None - if x.exception is None: + if x.updated: self.gui.library_view.model().refresh_ids( x.updated, cr) if self.gui.cover_flow: self.gui.cover_flow.dataChanged() - if x.failures: - details = ['%s: %s'%(title, reason) for title, - reason in x.failures.values()] - details = '%s\n'%('\n'.join(details)) - warning_dialog(self.gui, _('Failed to download some metadata'), - _('Failed to download metadata for the following:'), - det_msg=details).exec_() - else: - err = _('Failed to download metadata:') - error_dialog(self.gui, _('Error'), err, det_msg=x.tb).exec_() - def edit_metadata(self, checked, bulk=None): ''' diff --git a/src/calibre/gui2/metadata.py b/src/calibre/gui2/metadata.py index a36571fc91..b11e2ad28a 100644 --- a/src/calibre/gui2/metadata.py +++ b/src/calibre/gui2/metadata.py @@ -9,52 +9,59 @@ __docformat__ = 'restructuredtext en' import traceback from threading import Thread from Queue import Queue, Empty +from functools import partial +from PyQt4.Qt import QObject, Qt, pyqtSignal, QTimer, QDialog, \ + QVBoxLayout, QTextBrowser, QLabel, QGroupBox, QDialogButtonBox from calibre.ebooks.metadata.fetch import search, get_social_metadata -from calibre.gui2 import config +from calibre.gui2 import config, error_dialog +from calibre.gui2.dialogs.progress import ProgressDialog from calibre.ebooks.metadata.covers import download_cover from calibre.customize.ui import get_isbndb_key -from calibre import prints -from calibre.constants import DEBUG class Worker(Thread): 'Cover downloader' def __init__(self): Thread.__init__(self) - self.setDaemon(True) + self.daemon = True self.jobs = Queue() self.results = Queue() def run(self): while True: - mi = self.jobs.get() + id, mi = self.jobs.get() if not getattr(mi, 'isbn', False): break try: cdata, errors = download_cover(mi) if cdata: - self.results.put((mi.isbn, cdata)) - elif DEBUG: - prints('Cover download failed:', errors) + self.results.put((id, mi, True, cdata)) + else: + msg = [] + for e in errors: + if not e[0]: + msg.append(e[-1] + ' - ' + e[1]) + self.results.put((id, mi, False, '\n'.join(msg))) except: - traceback.print_exc() + self.results.put((id, mi, False, traceback.format_exc())) def __enter__(self): self.start() return self def __exit__(self, *args): - self.jobs.put(False) + self.jobs.put((False, False)) class DownloadMetadata(Thread): + 'Metadata downloader' def __init__(self, db, ids, get_covers, set_metadata=True, get_social_metadata=True): Thread.__init__(self) - self.setDaemon(True) + self.daemon = True self.metadata = {} self.covers = {} self.set_metadata = set_metadata @@ -64,34 +71,42 @@ class DownloadMetadata(Thread): self.updated = set([]) self.get_covers = get_covers self.worker = Worker() + self.results = Queue() + self.keep_going = True for id in ids: self.metadata[id] = db.get_metadata(id, index_is_id=True) self.metadata[id].rating = None + self.total = len(ids) + if self.get_covers: + self.total += len(ids) + self.fetched_metadata = {} + self.fetched_covers = {} + self.failures = {} + self.cover_failures = {} + self.exception = self.tb = None def run(self): - self.exception = self.tb = None try: self._run() except Exception, e: self.exception = e - import traceback self.tb = traceback.format_exc() def _run(self): self.key = get_isbndb_key() if not self.key: self.key = None - self.fetched_metadata = {} - self.failures = {} with self.worker: for id, mi in self.metadata.items(): + if not self.keep_going: + break args = {} if mi.isbn: args['isbn'] = mi.isbn else: if mi.is_null('title'): self.failures[id] = \ - (str(id), _('Book has neither title nor ISBN')) + _('Book has neither title nor ISBN') continue args['title'] = mi.title if mi.authors and mi.authors[0] != _('Unknown'): @@ -102,8 +117,11 @@ class DownloadMetadata(Thread): if results: fmi = results[0] self.fetched_metadata[id] = fmi - if fmi.isbn and self.get_covers: - self.worker.jobs.put(fmi) + if self.get_covers: + if fmi.isbn: + self.worker.jobs.put((id, fmi)) + else: + self.results.put((id, 'cover', False, mi.title)) if (not config['overwrite_author_title_metadata']): fmi.authors = mi.authors fmi.author_sort = mi.author_sort @@ -115,42 +133,163 @@ class DownloadMetadata(Thread): mi.rating *= 2 if not self.get_social_metadata: mi.tags = [] + self.results.put((id, 'metadata', True, mi.title)) else: - self.failures[id] = (mi.title, - _('No matches found for this book')) + self.failures[id] = _('No matches found for this book') + self.results.put((id, 'metadata', False, mi.title)) + self.results.put((id, 'cover', False, mi.title)) self.commit_covers() self.commit_covers(True) - for id in self.fetched_metadata: - mi = self.metadata[id] - if self.set_metadata: - self.db.set_metadata(id, mi) - if not self.set_metadata and self.get_social_metadata: - if mi.rating: - self.db.set_rating(id, mi.rating) - if mi.tags: - self.db.set_tags(id, mi.tags) - if mi.comments: - self.db.set_comment(id, mi.comments) - if mi.series: - self.db.set_series(id, mi.series) - if mi.series_index is not None: - self.db.set_series_index(id, mi.series_index) - - self.updated = set(self.fetched_metadata) - def commit_covers(self, all=False): if all: self.worker.jobs.put(False) while True: try: - isbn, cdata = self.worker.results.get(False) - for id, mi in self.metadata.items(): - if mi.isbn == isbn: - self.db.set_cover(id, cdata) + id, fmi, ok, cdata = self.worker.results.get(False) + if ok: + self.fetched_covers[id] = cdata + self.results.put((id, 'cover', ok, fmi.title)) + else: + self.results.put((id, 'cover', ok, fmi.title)) + try: + self.cover_failures[id] = unicode(cdata) + except: + self.cover_failures[id] = repr(cdata) except Empty: if not all or not self.worker.is_alive(): return +class DoDownload(QObject): + + idle_process = pyqtSignal() + + def __init__(self, parent, title, db, ids, get_covers, set_metadata=True, + get_social_metadata=True): + QObject.__init__(self, parent) + self.pd = ProgressDialog(title, min=0, max=0, parent=parent) + self.pd.canceled_signal.connect(self.cancel) + self.idle_process.connect(self.do_one, type=Qt.QueuedConnection) + self.downloader = None + self.create = partial(DownloadMetadata, db, ids, get_covers, + set_metadata=set_metadata, + get_social_metadata=get_social_metadata) + self.timer = QTimer(self) + self.timer.timeout.connect(self.do_one, type=Qt.QueuedConnection) + self.db = db + self.updated = set([]) + self.total = len(ids) + + def exec_(self): + self.timer.start(50) + ret = self.pd.exec_() + if getattr(self.downloader, 'exception', None) is not None and \ + ret == self.pd.Accepted: + error_dialog(self.parent(), _('Failed'), + _('Failed to download metadata'), show=True) + else: + self.show_report() + return ret + + def cancel(self, *args): + self.timer.stop() + self.downloader.keep_going = False + self.pd.reject() + + def do_one(self): + if self.downloader is None: + self.downloader = self.create() + self.downloader.start() + self.pd.set_min(0) + self.pd.set_max(self.downloader.total) + try: + r = self.downloader.results.get_nowait() + self.handle_result(r) + except Empty: + pass + if not self.downloader.is_alive(): + self.timer.stop() + self.pd.accept() + + def handle_result(self, r): + id_, typ, ok, title = r + what = _('cover') if typ == 'cover' else _('metadata') + which = _('Downloaded') if ok else _('Failed to get') + self.pd.set_msg(_('%s %s for: %s') % (which, what, title)) + self.pd.value += 1 + if ok: + self.updated.add(id_) + if typ == 'cover': + try: + self.db.set_cover(id_, + self.downloader.fetched_covers.pop(id_)) + except: + self.downloader.cover_failures[id_] = \ + traceback.format_exc() + else: + try: + self.set_metadata(id_) + except: + self.downloader.failures[id_] = \ + traceback.format_exc() + + def set_metadata(self, id_): + mi = self.downloader.metadata[id_] + if self.downloader.set_metadata: + self.db.set_metadata(id_, mi) + if not self.downloader.set_metadata and self.downloader.get_social_metadata: + if mi.rating: + self.db.set_rating(id_, mi.rating) + if mi.tags: + self.db.set_tags(id_, mi.tags) + if mi.comments: + self.db.set_comment(id_, mi.comments) + if mi.series: + self.db.set_series(id_, mi.series) + if mi.series_index is not None: + self.db.set_series_index(id_, mi.series_index) + + def show_report(self): + f, cf = self.downloader.failures, self.downloader.cover_failures + report = [] + if f: + report.append( + '<h3>Failed to download metadata for the following:</h3><ol>') + for id_, err in f.items(): + mi = self.downloader.metadata[id_] + report.append('<li><b>%s</b><pre>%s</pre></li>' % (mi.title, + unicode(err))) + report.append('</ol>') + if cf: + report.append( + '<h3>Failed to download cover for the following:</h3><ol>') + for id_, err in cf.items(): + mi = self.downloader.metadata[id_] + report.append('<li><b>%s</b><pre>%s</pre></li>' % (mi.title, + unicode(err))) + report.append('</ol>') + + if len(self.updated) != self.total or report: + d = QDialog(self.parent()) + bb = QDialogButtonBox(QDialogButtonBox.Ok, parent=d) + v1 = QVBoxLayout() + d.setLayout(v1) + d.setWindowTitle(_('Done')) + v1.addWidget(QLabel(_('Successfully downloaded metadata for %d out of %d books') % + (len(self.updated), self.total))) + gb = QGroupBox(_('Details'), self.parent()) + v2 = QVBoxLayout() + gb.setLayout(v2) + b = QTextBrowser(self.parent()) + v2.addWidget(b) + b.setHtml('\n'.join(report)) + v1.addWidget(gb) + v1.addWidget(bb) + bb.accepted.connect(d.accept) + d.resize(800, 600) + d.exec_() + + + From 8062c04b817d0193f7a597c874458aa468f43d1d Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Fri, 1 Oct 2010 03:38:16 -0600 Subject: [PATCH 234/235] EPUB Input: Ignore OPF files in the EPUB whose names start with a period --- src/calibre/ebooks/epub/input.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/epub/input.py b/src/calibre/ebooks/epub/input.py index 214511ae14..cdd69ea50f 100644 --- a/src/calibre/ebooks/epub/input.py +++ b/src/calibre/ebooks/epub/input.py @@ -117,7 +117,8 @@ class EPUBInput(InputFormatPlugin): encfile = os.path.abspath(os.path.join('META-INF', 'encryption.xml')) opf = None for f in walk(u'.'): - if f.lower().endswith('.opf') and '__MACOSX' not in f: + if f.lower().endswith('.opf') and '__MACOSX' not in f and \ + not os.path.basename(f).startswith('.'): opf = os.path.abspath(f) break path = getattr(stream, 'name', 'stream') From b95079ec8ccf7ab5b3b231d77a7ebf4e08ee31d4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal <kovid@kovidgoyal.net> Date: Fri, 1 Oct 2010 04:28:10 -0600 Subject: [PATCH 235/235] MOBI Input: Treat blockquote as having left margin of 1.0em instead of 1.25em --- src/calibre/ebooks/mobi/reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py index 6a44c2aa77..0cf31d64ec 100644 --- a/src/calibre/ebooks/mobi/reader.py +++ b/src/calibre/ebooks/mobi/reader.py @@ -234,7 +234,7 @@ class MobiReader(object): self.debug = debug self.embedded_mi = None self.base_css_rules = textwrap.dedent(''' - blockquote { margin: 0em 0em 0em 1.25em; text-align: justify } + blockquote { margin: 0em 0em 0em 1em; text-align: justify } p { margin: 0em; text-align: justify }