From 83126c4bf5c198e0364432b5e3ee38750fcb6977 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 9 Aug 2013 08:17:49 +0530
Subject: [PATCH] ...

---
 src/calibre/ebooks/oeb/polish/embed.py | 4 ++--
 src/calibre/gui2/convert/page_setup.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/embed.py b/src/calibre/ebooks/oeb/polish/embed.py
index 1f5412bbc9..4d6b826de7 100644
--- a/src/calibre/ebooks/oeb/polish/embed.py
+++ b/src/calibre/ebooks/oeb/polish/embed.py
@@ -67,8 +67,8 @@ def embed_font(container, font, all_font_rules, report, warned):
                 rule['src'] = 'url(%s)' % href
                 rule['name'] = name
                 return rule
-        msg = _('Failed to find font matching: family: %s; weight: %s; style: %s; stretch: %s') % (
-            ff, font['font-weight'], font['font-style'], font['font-stretch'])
+        msg = _('Failed to find font matching: family: %(family)s; weight: %(weight)s; style: %(style)s; stretch: %(stretch)s') % dict(
+            family=ff, weight=font['font-weight'], style=font['font-style'], stretch=font['font-stretch'])
         if msg not in warned:
             warned.add(msg)
             report(msg)
diff --git a/src/calibre/gui2/convert/page_setup.py b/src/calibre/gui2/convert/page_setup.py
index ac93557dd1..16196990f2 100644
--- a/src/calibre/gui2/convert/page_setup.py
+++ b/src/calibre/gui2/convert/page_setup.py
@@ -31,7 +31,7 @@ class ProfileModel(QAbstractListModel):
             if w >= 10000:
                 ss = _('unlimited')
             else:
-                ss = _('%d x %d pixels') % (w, h)
+                ss = _('%(width)d x %(height)d pixels') % dict(width=w, height=h)
             ss = _('Screen size: %s') % ss
             return QVariant('%s [%s]' % (profile.description, ss))
         return NONE