...

src/calibre/gui2/add.py

@@ -382,8 +382,8 @@ class Adder(QObject): # {{{
         if not duplicates:
             return self.duplicates_processed()
         self.pd.hide()
-        files = [_('%s by %s')%(x[0].title, x[0].format_field('authors')[1])
+        files = [_('%(title)s by %(author)s')%dict(title=x[0].title,
-                for x in duplicates]
+            author=x[0].format_field('authors')[1]) for x in duplicates]
         if question_dialog(self._parent, _('Duplicates found!'),
                         _('Books with the same title as the following already '
                         'exist in the database. Add them anyway?'),

src/calibre/gui2/auto_add.py

@@ -209,8 +209,8 @@ class AutoAdder(QObject):
                 paths.extend(p)
                 formats.extend(f)
                 metadata.extend(mis)
-            files = [_('%s by %s')%(mi.title, mi.format_field('authors')[1])
+            files = [_('%(title)s by %(author)s')%dict(title=mi.title,
-                    for mi in metadata]
+                author=mi.format_field('authors')[1]) for mi in metadata]
             if question_dialog(self.parent(), _('Duplicates found!'),
                         _('Books with the same title as the following already '
                         'exist in the database. Add them anyway?'),
@@ -228,8 +228,8 @@ class AutoAdder(QObject):
         if count > 0:
             m.books_added(count)
             gui.status_bar.show_message(_(
-                'Added %d book(s) automatically from %s') %
+                'Added %(num)d book(s) automatically from %(src)s') %
-                (count, self.worker.path), 2000)
+                dict(num=count, src=self.worker.path), 2000)
             if hasattr(gui, 'db_images'):
                 gui.db_images.reset()
 

src/calibre/gui2/filename_pattern.ui

@@ -116,7 +116,7 @@
             <item row="0" column="1">
              <widget class="QLineEdit" name="title">
               <property name="toolTip">
-               <string>Regular expression (?P&amp;lt;title&amp;gt;)</string>
+               <string>Regular expression (?P&lt;title&gt;)</string>
               </property>
               <property name="text">
                <string>No match</string>