Merge from trunk

resources/default_tweaks.py

@@ -292,13 +292,17 @@ maximum_resort_levels = 5
 generate_cover_title_font = None
 generate_cover_foot_font = None
 
-#: Control behavior of double clicks on the book list
+#: Control behavior of the book list
-# Behavior of doubleclick on the books list. Choices: open_viewer, do_nothing,
+# You can control the behavior of doubleclicks on the books list.
+# Choices: open_viewer, do_nothing,
 # edit_cell, edit_metadata. Selecting edit_metadata has the side effect of
 # disabling editing a field using a single click.
 # Default: open_viewer.
 # Example: doubleclick_on_library_view = 'do_nothing'
+# You can also control whether the book list scrolls horizontal per column or
+# per pixel. Default is per column.
 doubleclick_on_library_view = 'open_viewer'
+horizontal_scrolling_per_column = True
 
 #: Language to use when sorting.
 # Setting this tweak will force sorting to use the

src/calibre/devices/apple/driver.py

@@ -120,7 +120,7 @@ class DriverBase(DeviceConfig, DevicePlugin):
             _('Cache covers from iTunes/iBooks') +
                 ':::' +
                 _('Enable to cache and display covers from iTunes/iBooks'),
-            _("'Copy files to iTunes Media folder" u"\u2026" "' is enabled in iTunes Preferences|Advanced") +
+            _(u'"Copy files to iTunes Media folder %s" is enabled in iTunes Preferences|Advanced')%u'\u2026' +
                 ':::' +
                 _("<p>This setting should match your iTunes <i>Preferences</i>|<i>Advanced</i> setting.</p>"
                   "<p>Disabling will store copies of books transferred to iTunes in your calibre configuration directory.</p>"

src/calibre/gui2/library/views.py

@@ -51,7 +51,8 @@ class BooksView(QTableView): # {{{
     def __init__(self, parent, modelcls=BooksModel, use_edit_metadata_dialog=True):
         QTableView.__init__(self, parent)
 
-        self.setHorizontalScrollMode(self.ScrollPerPixel)
+        if not tweaks['horizontal_scrolling_per_column']:
+            self.setHorizontalScrollMode(self.ScrollPerPixel)
 
         self.setEditTriggers(self.EditKeyPressed)
         if tweaks['doubleclick_on_library_view'] == 'edit_cell':
@@ -218,7 +219,7 @@ class BooksView(QTableView): # {{{
 
             self.column_header_context_menu.addSeparator()
             self.column_header_context_menu.addAction(
-                    _('Resize column to fit'),
+                    _('Shrink column if it is too wide to fit'),
                     partial(self.resize_column_to_fit, column=self.column_map[idx]))
             self.column_header_context_menu.addAction(
                     _('Restore default layout'),

src/calibre/gui2/preferences/save_template.py

@@ -31,7 +31,7 @@ class SaveTemplate(QWidget, Ui_Form):
                     (var, FORMAT_ARG_DESCS[var]))
         rows.append(u'<tr><td>%s&nbsp;</td><td>&nbsp;</td><td>%s</td></tr>'%(
             _('Any custom field'),
-            _('The lookup name of any custom field. These names begin with "#")')))
+            _('The lookup name of any custom field (these names begin with "#").')))
         table = u'<table>%s</table>'%(u'\n'.join(rows))
         self.template_variables.setText(table)