Sync to trunk.

This commit is contained in:
John Schember 2009-07-25 16:10:15 -04:00
commit 6e84f880de
3 changed files with 12 additions and 5 deletions

View File

@ -350,14 +350,17 @@ OptionRecommendation(name='read_metadata_from_opf',
OptionRecommendation(name='asciiize', OptionRecommendation(name='asciiize',
recommended_value=False, level=OptionRecommendation.LOW, 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 ' 'representation. Use with care because this will remove replace '
'unicode characters with ASCII. For instance it will replace ' 'unicode characters with ASCII. For instance it will replace "%s" '
u'"Михаил Горбачёв" with "Mikhail Gorbachiov". Also, note that in ' 'with "Mikhail Gorbachiov". Also, note that in '
'cases where there are multiple representations of a character ' 'cases where there are multiple representations of a character '
'(characters shared by Chinese and Japanese for instance) the ' '(characters shared by Chinese and Japanese for instance) the '
'representation used by the largest number of people will be ' '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', OptionRecommendation(name='title',

View File

@ -89,7 +89,7 @@ class CybookG3(Device):
name = 'Cybook Gen 3' name = 'Cybook Gen 3'
output_format = 'MOBI' output_format = 'MOBI'
output_profile = 'cybookg3' output_profile = 'cybookg3'
manufacturer = 'Booken' manufacturer = 'Bookeen'
id = 'cybookg3' id = 'cybookg3'
class CybookOpus(CybookG3): class CybookOpus(CybookG3):

View File

@ -82,6 +82,10 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.
</pre> </pre>
<h4>Note</h4> <h4>Note</h4>
<ul> <ul>
<li>On some linux distributions, you have to install the
libphonon (may be called libphonon4) package for calibre
to work.
</li>
<li> <li>
When running the command line utilities, When running the command line utilities,
they will segfault after completion. This can they will segfault after completion. This can