String changes

src/calibre/customize/conversion.py

@@ -149,7 +149,7 @@ class InputFormatPlugin(Plugin):
     #: a list of images.
     is_image_collection = False
 
-    #: Number of CPU cores used by this plugin
+    #: Number of CPU cores used by this plugin.
     #: A value of -1 means that it uses all available cores
     core_usage = 1
 

src/calibre/gui2/convert/fb2_output.ui

@@ -30,7 +30,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Sectionize:</string>
+      <string>&amp;Sectionize:</string>
      </property>
      <property name="buddy">
       <cstring>opt_sectionize</cstring>
@@ -47,7 +47,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Genre</string>
+      <string>&amp;Genre</string>
      </property>
     </widget>
    </item>

src/calibre/gui2/convert/pdb_output.ui

@@ -50,7 +50,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Output Encoding:</string>
+      <string>Output &amp;encoding:</string>
      </property>
     </widget>
    </item>

src/calibre/gui2/convert/structure_detection.py

@@ -29,11 +29,11 @@ class StructureDetectionWidget(Widget, Ui_Form):
         for x in ('pagebreak', 'rule', 'both', 'none'):
             self.opt_chapter_mark.addItem(x)
         self.initialize_options(get_option, get_help, db, book_id)
-        self.opt_chapter.set_msg(_('Detect chapters at (XPath expression):'))
+        self.opt_chapter.set_msg(_('Detect &chapters at (XPath expression):'))
-        self.opt_page_breaks_before.set_msg(_('Insert page breaks before '
+        self.opt_page_breaks_before.set_msg(_('Insert &page breaks before '
             '(XPath expression):'))
         self.opt_start_reading_at.set_msg(
-                _('Start reading at (XPath expression):'))
+                _('Start &reading at (XPath expression):'))
 
     def break_cycles(self):
         Widget.break_cycles(self)

src/calibre/gui2/convert/txt_output.ui

@@ -118,14 +118,14 @@
       <item>
        <widget class="QCheckBox" name="opt_keep_image_references">
         <property name="text">
-         <string>Do not remove image references before processing</string>
+         <string>Do not remove image &amp;references before processing</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="opt_keep_color">
         <property name="text">
-         <string>Keep text color, when possible</string>
+         <string>Keep text &amp;color, when possible</string>
         </property>
        </widget>
       </item>

src/calibre/gui2/dialogs/edit_authors_dialog.py

@@ -163,11 +163,11 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
 
     def show_context_menu(self, point):
         self.context_item = self.table.itemAt(point)
-        case_menu = QMenu(_('Change Case'))
+        case_menu = QMenu(_('Change case'))
-        action_upper_case = case_menu.addAction(_('Upper Case'))
+        action_upper_case = case_menu.addAction(_('Upper case'))
-        action_lower_case = case_menu.addAction(_('Lower Case'))
+        action_lower_case = case_menu.addAction(_('Lower case'))
-        action_swap_case = case_menu.addAction(_('Swap Case'))
+        action_swap_case = case_menu.addAction(_('Swap case'))
-        action_title_case = case_menu.addAction(_('Title Case'))
+        action_title_case = case_menu.addAction(_('Title case'))
         action_capitalize = case_menu.addAction(_('Capitalize'))
 
         action_upper_case.triggered.connect(self.upper_case)

src/calibre/gui2/dialogs/edit_authors_dialog.ui

@@ -82,14 +82,14 @@
      <item row="0" column="0">
       <widget class="QPushButton" name="sort_by_author">
        <property name="text">
-        <string>Sort by author</string>
+        <string>Sort by &amp;author</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QPushButton" name="sort_by_author_sort">
        <property name="text">
-        <string>Sort by author sort</string>
+        <string>Sort by author &amp;sort</string>
        </property>
       </widget>
      </item>
@@ -101,7 +101,7 @@ generated from the author. Exactly how this value is automatically
 generated can be controlled via Preferences-&gt;Advanced-&gt;Tweaks</string>
        </property>
        <property name="text">
-        <string>Recalculate all author sort values</string>
+        <string>&amp;Recalculate all author sort values</string>
        </property>
       </widget>
      </item>
@@ -112,7 +112,7 @@ generated can be controlled via Preferences-&gt;Advanced-&gt;Tweaks</string>
 after changing Preferences-&gt;Advanced-&gt;Tweaks-&gt;Author sort name algorithm</string>
        </property>
        <property name="text">
-        <string>Copy all author sort values to author</string>
+        <string>&amp;Copy all author sort values to author</string>
        </property>
       </widget>
      </item>

src/calibre/gui2/dialogs/saved_search_editor.ui

@@ -48,7 +48,7 @@
         </size>
        </property>
        <property name="text">
-        <string>Saved search: </string>
+        <string>&amp;Saved search: </string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/calibre/gui2/dialogs/tag_categories.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>588</width>
+    <width>628</width>
     <height>482</height>
    </rect>
   </property>
@@ -14,7 +14,7 @@
    <string>User Categories Editor</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../../../../resources/images.qrc">
     <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
   </property>
   <layout class="QGridLayout">
@@ -35,7 +35,7 @@
         </size>
        </property>
        <property name="text">
-        <string>Category name: </string>
+        <string>Category &amp;name: </string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -78,7 +78,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset>
+      <iconset resource="../../../../resources/images.qrc">
        <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
      </property>
     </widget>
@@ -107,9 +107,8 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset>
+        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/plus.png</normaloff>:/images/plus.png
+         <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
-        </iconset>
        </property>
       </widget>
      </item>
@@ -124,7 +123,7 @@
       <string>...</string>
      </property>
      <property name="icon">
-      <iconset>
+      <iconset resource="../../../../resources/images.qrc">
        <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
      </property>
     </widget>
@@ -134,11 +133,14 @@
      <item>
       <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Category filter: </string>
+        <string>Category &amp;filter: </string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
        </property>
+       <property name="buddy">
+        <cstring>category_filter_box</cstring>
+       </property>
       </widget>
      </item>
      <item>
@@ -155,10 +157,10 @@
      <property name="toolTip">
       <string>&lt;p&gt;Show items in the Available items box only if they appear in the
       current virtual library. Applied items not in the VL will be marked
-      "not on any book".&lt;/p&gt;</string>
+      &quot;not on any book&quot;.&lt;/p&gt;</string>
      </property>
      <property name="text">
-      <string>Show only available items in current virtual library</string>
+      <string>&amp;Show only available items in current virtual library</string>
      </property>
     </widget>
    </item>
@@ -234,7 +236,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset>
+        <iconset resource="../../../../resources/images.qrc">
          <normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
        </property>
       </widget>
@@ -319,7 +321,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-        <iconset>
+        <iconset resource="../../../../resources/images.qrc">
          <normaloff>:/images/list_remove.png</normaloff>:/images/list_remove.png</iconset>
        </property>
       </widget>
@@ -355,7 +357,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../../../calibre_datesearch/resources/images"/>
+  <include location="../../../../resources/images.qrc"/>
  </resources>
  <connections>
   <connection>

src/calibre/gui2/filename_pattern.ui

@@ -58,7 +58,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>&amp;Test</string>
+      <string>Test</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>

src/calibre/gui2/preferences/adding.ui

@@ -63,7 +63,7 @@
           </size>
          </property>
          <property name="title">
-          <string>&amp;Configure metadata from file name</string>
+          <string>Configure metadata from file name</string>
          </property>
         </widget>
        </item>
@@ -223,7 +223,7 @@ Author matching is exact.</string>
        <item row="14" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Control &amp;how tags are processed:</string>
+          <string>Control how tags are processed:</string>
          </property>
          <property name="buddy">
           <cstring>tag_map_rules_button</cstring>
@@ -250,7 +250,7 @@ Author matching is exact.</string>
        <item row="18" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Control &amp;which files are added during bulk imports:</string>
+          <string>Control which files are added during bulk imports:</string>
          </property>
          <property name="buddy">
           <cstring>add_filter_rules_button</cstring>
@@ -344,11 +344,14 @@ that have been explicitly ignored below.</string>
           <item>
            <widget class="QLabel" name="label_3">
             <property name="text">
-             <string>&lt;b&gt;Ignore&lt;/b&gt; files with the following extensions when automatically adding </string>
+             <string>&lt;b&gt;Ignore&lt;/b&gt; files with the following &amp;extensions when automatically adding </string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
             </property>
+            <property name="buddy">
+             <cstring>opt_blocked_auto_formats</cstring>
+            </property>
            </widget>
           </item>
           <item>
@@ -367,11 +370,14 @@ that have been explicitly ignored below.</string>
        <item row="0" column="0" colspan="2">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Specify a folder. Any files you put into this folder will be automatically added to calibre (restart required).</string>
+          <string>Specify a &amp;folder. Any files you put into this folder will be automatically added to calibre (restart required).</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
+         <property name="buddy">
+          <cstring>opt_auto_add_path</cstring>
+         </property>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">

src/calibre/gui2/preferences/plugboard.ui

@@ -75,7 +75,7 @@ One possible use for a plugboard is to alter the title to contain series informa
      <item row="1" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Add new plugboard:</string>
+        <string>Add &amp;new plugboard:</string>
        </property>
        <property name="buddy">
         <cstring>new_format</cstring>
@@ -91,7 +91,7 @@ One possible use for a plugboard is to alter the title to contain series informa
      <item row="2" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Edit existing plugboard:</string>
+        <string>Edit &amp;existing plugboard:</string>
        </property>
        <property name="buddy">
         <cstring>edit_format</cstring>
@@ -107,7 +107,7 @@ One possible use for a plugboard is to alter the title to contain series informa
      <item row="3" column="0">
       <widget class="QLabel" name="label_41">
        <property name="text">
-        <string>Existing plugboards:</string>
+        <string>Existing &amp;plugboards:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

src/calibre/gui2/preferences/save_template.ui

@@ -59,7 +59,7 @@
       <item row="1" column="1">
        <widget class="QPushButton" name="open_editor">
         <property name="text">
-         <string>Template editor</string>
+         <string>Template &amp;editor</string>
         </property>
        </widget>
       </item>

src/calibre/gui2/tweak_book/search.py

@@ -246,7 +246,7 @@ class SearchWidget(QWidget):
 
         self.fl = fl = QLabel(_('&Find:'))
         fl.setAlignment(Qt.AlignRight | Qt.AlignCenter)
-        self.find_text = ft = HistoryBox(self, _('Clear search history'))
+        self.find_text = ft = HistoryBox(self, _('Clear search &history'))
         ft.save_search.connect(self.save_search)
         ft.show_saved_searches.connect(self.show_saved_searches)
         ft.initialize('tweak_book_find_edit')
@@ -258,7 +258,7 @@ class SearchWidget(QWidget):
 
         self.rl = rl = QLabel(_('&Replace:'))
         rl.setAlignment(Qt.AlignRight | Qt.AlignCenter)
-        self.replace_text = rt = HistoryBox(self, _('Clear replace history'))
+        self.replace_text = rt = HistoryBox(self, _('Clear replace &history'))
         rt.save_search.connect(self.save_search)
         rt.show_saved_searches.connect(self.show_saved_searches)
         rt.initialize('tweak_book_replace_edit')

src/calibre/gui2/tweak_book/ui.py

@@ -363,7 +363,7 @@ class Main(MainWindow):
                                       _('Cut text'))
         self.action_editor_copy = reg('edit-copy.png', _('&Copy to clipboard'), self.boss.do_editor_copy, 'editor-copy', ('Ctrl+C', 'Ctrl+Insert'),
                                       _('Copy to clipboard'))
-        self.action_editor_paste = reg('edit-paste.png', _('&Paste from clipboard'), self.boss.do_editor_paste, 'editor-paste', ('Ctrl+V', 'Shift+Insert', ),
+        self.action_editor_paste = reg('edit-paste.png', _('P&aste from clipboard'), self.boss.do_editor_paste, 'editor-paste', ('Ctrl+V', 'Shift+Insert', ),
                                       _('Paste from clipboard'))
         self.action_editor_cut.setEnabled(False)
         self.action_editor_copy.setEnabled(False)

src/calibre/gui2/viewer/config.ui

@@ -543,14 +543,14 @@ QToolBox::tab:hover {
              <item>
               <widget class="QPushButton" name="change_background_color_button">
                <property name="text">
-                <string>Change</string>
+                <string>&amp;Change</string>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QPushButton" name="reset_background_color_button">
                <property name="text">
-                <string>Reset</string>
+                <string>&amp;Reset</string>
                </property>
               </widget>
              </item>
@@ -575,7 +575,7 @@ QToolBox::tab:hover {
              <item>
               <widget class="QPushButton" name="change_text_color_button">
                <property name="text">
-                <string>Change</string>
+                <string>&amp;Change</string>
                </property>
               </widget>
              </item>
@@ -809,7 +809,7 @@ QToolBox::tab:hover {
            <item row="3" column="0">
             <widget class="QLabel" name="label_26">
              <property name="text">
-              <string>&amp;Search online URL:</string>
+              <string>Search &amp;online URL:</string>
              </property>
              <property name="buddy">
               <cstring>search_online_url</cstring>
@@ -835,7 +835,7 @@ You must enter the search URL for the search engine, with the placeholder
            <item row="5" column="0" colspan="2">
             <widget class="QCheckBox" name="opt_remember_current_page">
              <property name="text">
-              <string>Remember the &amp;current page when quitting</string>
+              <string>Remember the current &amp;page when quitting</string>
              </property>
             </widget>
            </item>
@@ -855,7 +855,7 @@ You must enter the search URL for the search engine, with the placeholder
               <string>Normally, you can view multiple books in calibre, each in its own viewer window. With this option, if you attempt to view a second book, it will replace the previously opened book instead of using a new window.</string>
              </property>
              <property name="text">
-              <string>Allow only a &amp;single book to be viewed at a time (needs restart)</string>
+              <string>Allow only a single book to be &amp;viewed at a time (needs restart)</string>
              </property>
             </widget>
            </item>
@@ -869,7 +869,7 @@ You must enter the search URL for the search engine, with the placeholder
            <item row="9" column="0">
             <widget class="QPushButton" name="clear_search_history_button">
              <property name="text">
-              <string>Clear search history</string>
+              <string>Clear search &amp;history</string>
              </property>
             </widget>
            </item>

src/calibre/gui2/wizard/send_email.ui

@@ -41,7 +41,7 @@
       <string>&lt;p&gt;A mail server is useful if the service you are sending mail to only accepts email from well know mail services.</string>
      </property>
      <property name="title">
-      <string>Mail &amp;server</string>
+      <string>Mail server</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="0" column="0" colspan="4">