Sync to trunk.

setup/iso_639/da.po

@@ -10253,7 +10253,7 @@ msgstr ""
 
 #. name for inh
 msgid "Ingush"
-msgstr "Engelsk"
+msgstr "Ingush"
 
 #. name for inj
 msgid "Inga; Jungle"

src/calibre/ebooks/pdf/render/links.py

@@ -51,7 +51,7 @@ class Links(object):
         for link in self.links:
             path, href, frag = link[0]
             page, rect = link[1:]
-            combined_path = os.path.abspath(os.path.join(os.path.dirname(path), *href.split('/')))
+            combined_path = os.path.abspath(os.path.join(os.path.dirname(path), *unquote(href).split('/')))
             is_local = not href or combined_path in self.anchors
             annot = Dictionary({
                 'Type':Name('Annot'), 'Subtype':Name('Link'),

src/calibre/gui2/convert/single.py

@@ -75,7 +75,7 @@ class GroupModel(QAbstractListModel):
 def get_preferred_input_format_for_book(db, book_id):
     recs = load_specifics(db, book_id)
     if recs:
-        return recs.get('gui_preferred_input_format',  None)
+        return recs.get('gui_preferred_input_format', None)
 
 def get_available_formats_for_book(db, book_id):
     available_formats = db.formats(book_id, index_is_id=True)
@@ -147,6 +147,7 @@ class Config(ResizableDialog, Ui_Dialog):
         self.connect(self.groups, SIGNAL('entered(QModelIndex)'),
                 self.show_group_help)
         rb = self.buttonBox.button(self.buttonBox.RestoreDefaults)
+        rb.setText(_('Restore &Defaults'))
         self.connect(rb, SIGNAL('clicked()'), self.restore_defaults)
         self.groups.setMouseTracking(True)
         geom = gprefs.get('convert_single_dialog_geom', None)
@@ -188,7 +189,6 @@ class Config(ResizableDialog, Ui_Dialog):
             return cls(self.stack, self.plumber.get_option_by_name,
                 self.plumber.get_option_help, self.db, self.book_id)
 
-
         self.mw = widget_factory(MetadataWidget)
         self.setWindowTitle(_('Convert')+ ' ' + unicode(self.mw.title.text()))
         lf = widget_factory(LookAndFeelWidget)
@@ -209,7 +209,8 @@ class Config(ResizableDialog, Ui_Dialog):
                 self.plumber.get_option_help, self.db, self.book_id)
         while True:
             c = self.stack.currentWidget()
-            if not c: break
+            if not c:
+                break
             self.stack.removeWidget(c)
 
         widgets = [self.mw, lf, hw, ps, sd, toc, sr]
@@ -234,7 +235,6 @@ class Config(ResizableDialog, Ui_Dialog):
         except:
             pass
 
-
     def setup_input_output_formats(self, db, book_id, preferred_input_format,
             preferred_output_format):
         if preferred_output_format:

src/calibre/gui2/preferences/adding.ui

@@ -164,7 +164,7 @@ Author matching is exact.</string>
           <item>
            <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>Ignore files with the following extensions when automatically adding </string>
+             <string>&lt;b&gt;Ignore&lt;/b&gt; files with the following extensions when automatically adding </string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>