Pull from trunk

Changelog.yaml

@@ -23,7 +23,7 @@
 
     - title: "Allow editing of tweaks via Preferences->Advanced"
 
-    - title: "Add button to manage authors dialog to automatically reset all author sort values"
+    - title: "Add button to the manage authors dialog to automatically reset all author sort values"
 
   bug fixes:
     - title: "Fix regression in 0.7.13 that broke changing libraries"

resources/recipes/esquire.recipe

@@ -5,7 +5,6 @@ __copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
 www.esquire.com
 '''
 
-from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Esquire(BasicNewsRecipe):
@@ -20,8 +19,8 @@ class Esquire(BasicNewsRecipe):
     encoding              = 'cp1250'
     use_embedded_content  = False
     language              = 'en'
-    publication_type      = 'magazine'    
+    publication_type      = 'magazine'
-    masthead_url          = 'http://www.esquire.com/cm/shared/site_images/print_this/esquire_logo.gif'    
+    masthead_url          = 'http://www.esquire.com/cm/shared/site_images/print_this/esquire_logo.gif'
 
     conversion_options = {
                           'comment'   : description
@@ -33,7 +32,7 @@ class Esquire(BasicNewsRecipe):
     keep_only_tags    = [dict(name='div', attrs={'id':['article_header','article_content']})]
     remove_tags       = [dict(name=['object','link','embed','iframe','base'])]
     remove_attributes = ['width','height']
-    
+
     feeds = [
                (u'Style'    , u'http://www.esquire.com/style/rss/'    )
               ,(u'Women'    , u'http://www.esquire.com/women/rss/'    )

src/calibre/gui2/dialogs/choose_library.py

@@ -80,8 +80,10 @@ class ChooseLibrary(QDialog, Ui_Dialog):
             return error_dialog(self, _('No location'), _('No location selected'),
                     show=True)
         loc = os.path.abspath(text)
-        if not loc or not os.path.exists(loc) or not self.check_action(action,
+        if not loc or not os.path.exists(loc) or not os.path.isdir(loc):
-                loc):
+            return error_dialog(self, _('Bad location'),
+                    _('%s is not an existing folder')%loc, show=True)
+        if not self.check_action(action, loc):
             return
         QDialog.accept(self)
         self.location.save_history()