Sync to trunk.

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',

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):

src/calibre/trac/plugins/templates/linux.html

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