From ee9316a76cefe87001d5b5953aa4e09e65fd0ca3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 14 Jun 2008 08:03:25 -0700 Subject: [PATCH 01/17] Fix #784 --- src/calibre/ebooks/chardet/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/chardet/__init__.py b/src/calibre/ebooks/chardet/__init__.py index c0a9b45d0f..36d3b909de 100644 --- a/src/calibre/ebooks/chardet/__init__.py +++ b/src/calibre/ebooks/chardet/__init__.py @@ -46,7 +46,10 @@ def xml_to_unicode(raw, verbose=False): if match is not None: encoding = match.group(1) if encoding is None: - chardet = detect(raw) + try: + chardet = detect(raw) + except: + chardet = {'encoding':'utf-8', 'confidence':0} encoding = chardet['encoding'] if chardet['confidence'] < 1 and verbose: print 'WARNING: Encoding detection confidence %d%%'%(chardet['confidence']*100) From 9e076b8f3faf5bc159519c09598b882510dccf75 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 14 Jun 2008 08:05:48 -0700 Subject: [PATCH 02/17] IGN:... --- osx_installer.py | 4 - src/calibre/__init__.py | 4 +- src/calibre/translations/bg.po | 292 +++++++++++++++-------------- src/calibre/translations/ca.po | 292 +++++++++++++++-------------- src/calibre/translations/de.po | 297 ++++++++++++++++-------------- src/calibre/translations/es.po | 315 +++++++++++++++++--------------- src/calibre/translations/fr.po | 292 +++++++++++++++-------------- src/calibre/translations/it.po | 299 ++++++++++++++++-------------- src/calibre/translations/nds.po | 297 ++++++++++++++++-------------- src/calibre/translations/nl.po | 292 +++++++++++++++-------------- src/calibre/translations/ru.po | 292 +++++++++++++++-------------- src/calibre/translations/sl.po | 292 +++++++++++++++-------------- upload.py | 47 ++--- 13 files changed, 1612 insertions(+), 1403 deletions(-) diff --git a/osx_installer.py b/osx_installer.py index ce9ee98f5c..79e363618f 100644 --- a/osx_installer.py +++ b/osx_installer.py @@ -316,10 +316,6 @@ def main(): }, setup_requires = ['py2app'], ) - subprocess.check_call('scp dist/*.dmg giskard:work/calibre/dist', shell=True) -# if '--shutdown' in sys.argv: -# print 'Shutting down' -# subprocess.call(('/usr/bin/sudo', '/sbin/shutdown', '-h', '+0')) return 0 if __name__ == '__main__': diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 4574ed83f8..32a883b93f 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -15,7 +15,7 @@ from optparse import OptionParser as _OptionParser from optparse import IndentedHelpFormatter from logging import Formatter -from PyQt4.QtCore import QSettings, QVariant, QUrl +from PyQt4.QtCore import QSettings, QVariant, QUrl, QByteArray from PyQt4.QtGui import QDesktopServices from calibre.translations.msgfmt import make @@ -448,7 +448,7 @@ class Settings(QSettings): def set(self, key, val): val = cPickle.dumps(val, -1) - self.setValue(str(key), QVariant(val)) + self.setValue(str(key), QVariant(QByteArray(val))) _settings = Settings() if not _settings.get('migrated from QSettings'): diff --git a/src/calibre/translations/bg.po b/src/calibre/translations/bg.po index 35a6df932b..6cf334ee75 100644 --- a/src/calibre/translations/bg.po +++ b/src/calibre/translations/bg.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: calibre 0.4.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-09 20:36+0000\n" +"POT-Creation-Date: 2008-06-12 20:18+0000\n" "PO-Revision-Date: 2008-05-24 06:23+0000\n" "Last-Translator: Kovid Goyal \n" "Language-Team: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-06-11 03:04+0000\n" +"X-Launchpad-Export-Date: 2008-06-14 07:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Generated-By: pygettext.py 1.5\n" @@ -42,8 +42,8 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:255 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:661 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:677 msgid "Unknown" msgstr "" @@ -66,7 +66,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search.py:16 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:385 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:401 msgid "Publisher" msgstr "" @@ -713,9 +713,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:26 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search.py:14 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:252 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:380 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:731 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:396 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:747 msgid "Title" msgstr "" @@ -724,7 +724,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search.py:20 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:238 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:239 msgid "Comments" msgstr "" @@ -889,9 +889,9 @@ msgid "ERROR" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:257 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:381 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:732 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:397 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:748 msgid "Author(s)" msgstr "" @@ -967,118 +967,118 @@ msgstr "" msgid "&Stop selected job" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:289 msgid "Metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:56 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:286 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:290 msgid "Look & Feel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:291 msgid "Page Setup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:288 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:63 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:292 msgid "Chapter Detection" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:89 msgid "No available formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:86 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:90 msgid "Cannot convert %s as this book has no supported formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94 msgid "Choose the format to convert into LRF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:102 msgid "Convert %s to LRF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:161 msgid "Set conversion defaults" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:43 msgid "Cannot read" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:168 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:172 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:44 msgid "You do not have permission to read the file: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:176 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:180 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52 msgid "Error reading file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:177 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:181 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:53 msgid "

There was an error reading from file:
" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:187 msgid " is not a valid picture" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:249 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:253 msgid "" "Preprocess the file before converting to LRF. This is useful if you know " "that the file is from a specific source. Known sources:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:250 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:254 msgid "

  1. baen - Books from BAEN Publishers
    2. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:255 msgid "" "
  2. pdftohtml - HTML files that are the output of the program " "pdftohtml
    3. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:252 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:256 msgid "
  3. book-designer - HTML0 files from Book Designer
    4. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:289 msgid "" "Specify metadata such as title and author for the book.

    Metadata will be " "updated in the database as well as the generated LRF file." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:286 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:290 msgid "" "Adjust the look of the generated LRF file by specifying things like font " "sizes and the spacing between words." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:291 msgid "" "Specify the page settings like margins and the screen size of the target " "device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:288 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:292 msgid "Fine tune the detection of chapter and section headings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:300 msgid "No help available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:396 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:400 msgid "Bulk convert ebooks to LRF" msgstr "" @@ -1399,26 +1399,26 @@ msgstr "" msgid "Comma separated list of tags to remove from the books. " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:235 msgid "" "

    Enter your username and password for LibraryThing.com.
    If you " "do not have one, you can register " "for free!.

    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:265 msgid "Could not fetch cover.
    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:265 msgid "Could not fetch cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:272 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:271 msgid "Cannot fetch cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:272 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:271 msgid "You must specify the ISBN identifier for this book." msgstr "" @@ -1493,13 +1493,13 @@ msgid "Tag" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search.py:18 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:243 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:244 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:403 msgid "Series" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search.py:19 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:665 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:681 msgid "Format" msgstr "" @@ -1508,7 +1508,7 @@ msgid "Any" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96 msgid "Form" msgstr "" @@ -1768,7 +1768,7 @@ msgstr "" msgid "Recipe source code (python)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97 msgid "" "

    Set a regular expression pattern to use when trying to guess ebook " "metadata from filenames.

    A )" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:100 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:103 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:45 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:49 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:59 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:61 msgid "No match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:98 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105 msgid "Authors:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106 msgid "Regular expression group name (?P)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108 msgid "Series:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:102 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109 msgid "Regular expression group name (?P)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111 msgid "Series index:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115 msgid "Regular expression group name (?P)" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114 +msgid "ISBN:" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:291 msgid "Job" msgstr "" @@ -1888,54 +1895,54 @@ msgstr "" msgid "Cannot kill waiting jobs." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:227 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:233 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:238 msgid "None" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:228 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:386 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:671 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:735 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:402 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:687 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:751 msgid "Tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:235 msgid "Formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:243 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:244 msgid "Book %s of %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:372 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:388 msgid "Double click to edit me

    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:382 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:733 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:398 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:749 msgid "Size (MB)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:383 -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:734 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:399 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:750 msgid "Date" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:384 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:400 msgid "Rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:666 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:682 msgid "Path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:670 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:686 msgid "Timestamp" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library.py:770 +#: /home/kovid/work/calibre/src/calibre/gui2/library.py:786 msgid "Search (For Advanced Search click the button to the left)" msgstr "" @@ -2007,91 +2014,95 @@ msgstr "" msgid "Configure" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:80 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:82 msgid "Error communicating with device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:95 msgid "" "

    For help visit %s.kovidgoyal.net
    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:96 msgid "%s: %s by Kovid Goyal %%(version)s
    %%(device)s

    " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:114 msgid "Send to main memory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:115 msgid "Send to storage card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:118 msgid "Edit metadata individually" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:117 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:119 msgid "Edit metadata in bulk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:122 msgid "Add books from a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:123 msgid "" "Add books recursively (One book per directory, assumes every ebook file is " "the same book in a different format)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:124 msgid "" "Add books recursively (Multiple books per directory, assumes every ebook " "file is a different book)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:138 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:274 msgid "Save to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139 msgid "Save to disk in a single directory" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142 #: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280 msgid "View" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:143 msgid "View specific format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:158 msgid "Convert individually" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159 msgid "Bulk convert" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303 msgid " detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303 msgid "Device: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:338 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:328 +msgid "Connected " +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:340 msgid "Device database corrupted" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:339 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:341 msgid "" "\n" "

    The database of books on the reader is corrupted. Try the " @@ -2107,42 +2118,42 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:391 -#: /home/kovid/work/calibre/src/calibre/gui2/main.py:465 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/main.py:467 msgid "" "

    Books with the same title as the following already exist in the database. " "Add them anyway?