IGN:Tag release

resources/recipes/taz_rss.recipe

@@ -1,7 +1,7 @@
 __license__   = 'GPL v3'
 __copyright__ = '2010, Alexander Schremmer <alex@alexanderweb.de>'
 
-from calibre.resources.recipes import BasicNewsRecipe
+from calibre.web.feeds.news import BasicNewsRecipe
 
 class TazRSSRecipe(BasicNewsRecipe):
     title = u'Taz.de (die tageszeitung) RSS Feed - German'

setup/translations.py

@@ -197,7 +197,7 @@ class GetTranslations(Translations):
 class ISO639(Command):
 
     description = 'Compile translations for ISO 639 codes'
-    XML = '/usr/lib/python2.6/site-packages/pycountry/databases/iso639.xml'
+    XML = '/usr/lib/python2.7/site-packages/pycountry/databases/iso639.xml'
 
     def run(self, opts):
         src = self.XML

src/calibre/gui2/dialogs/metadata_bulk.py

@@ -163,7 +163,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         self.s_r_number_of_books = min(7, len(self.ids))
         for i in range(1,self.s_r_number_of_books+1):
             w = QtGui.QLabel(self.tabWidgetPage3)
-            w.setText(_('Book %d:'%i))
+            w.setText(_('Book %d:')%i)
             self.gridLayout1.addWidget(w, i+offset, 0, 1, 1)
             w = QtGui.QLineEdit(self.tabWidgetPage3)
             w.setReadOnly(True)