diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 3f89d21f7b..cb7cd519f0 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -350,14 +350,17 @@ OptionRecommendation(name='read_metadata_from_opf', OptionRecommendation(name='asciiize', recommended_value=False, level=OptionRecommendation.LOW, - help=_('Transliterate unicode characters to an ASCII ' + help=(_('Transliterate unicode characters to an ASCII ' 'representation. Use with care because this will remove replace ' - 'unicode characters with ASCII. For instance it will replace ' - u'"Михаил Горбачёв" with "Mikhail Gorbachiov". Also, note that in ' + '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).') + 'used (Chinese in the previous example).')%\ + u'\u041c\u0438\u0445\u0430\u0438\u043b ' + u'\u0413\u043e\u0440\u0431\u0430\u0447\u0451\u0432' +) ), OptionRecommendation(name='title', diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index f56f0fe7a7..b3f3c94653 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -89,7 +89,7 @@ class CybookG3(Device): name = 'Cybook Gen 3' output_format = 'MOBI' output_profile = 'cybookg3' - manufacturer = 'Booken' + manufacturer = 'Bookeen' id = 'cybookg3' class CybookOpus(CybookG3): diff --git a/src/calibre/trac/plugins/templates/linux.html b/src/calibre/trac/plugins/templates/linux.html index b948dccc74..58c3e8ad6a 100644 --- a/src/calibre/trac/plugins/templates/linux.html +++ b/src/calibre/trac/plugins/templates/linux.html @@ -82,6 +82,10 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.

Note