String changes

src/calibre/ebooks/conversion/plugins/txt_input.py

@@ -48,7 +48,7 @@ class TXTInput(InputFormatPlugin):
                    'Markdown or Textile formatting to ensure no formatting is lost.')),
         OptionRecommendation(name='formatting_type', recommended_value='auto',
             choices=['auto', 'plain', 'heuristic', 'textile', 'markdown'],
-            help=_('Formatting used within the document.'
+            help=_('Formatting used within the document.\n'
                    '* auto: Automatically decide which formatting processor to use.\n'
                    '* plain: Do not process the document formatting. Everything is a '
                    'paragraph and no styling is applied.\n'

src/calibre/gui2/dialogs/saved_search_editor.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Saved Search Editor</string>
+   <string>Saved search editor</string>
   </property>
   <property name="windowIcon">
    <iconset>
@@ -48,7 +48,7 @@
         </size>
        </property>
        <property name="text">
-        <string>Saved Search: </string>
+        <string>Saved search: </string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

src/calibre/gui2/dialogs/search.ui

@@ -201,7 +201,7 @@
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
-       <string>Titl&amp;e/Author/Series ...</string>
+       <string>Titl&amp;e/Author/Series...</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
        <item row="1" column="0">

src/calibre/gui2/dialogs/smartdevice.ui

@@ -46,7 +46,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="label_23">
      <property name="text">
-      <string>Calibre IP addresses:</string>
+      <string>calibre IP addresses:</string>
      </property>
     </widget>
    </item>

src/calibre/gui2/preferences/coloring.py

@@ -799,17 +799,17 @@ class RulesModel(QAbstractListModel):  # {{{
         if not isinstance(rule, Rule):
             if kind == 'color':
                 return _('''
-                <p>Advanced Rule for column <b>%(col)s</b>:
+                <p>Advanced rule for column <b>%(col)s</b>:
                 <pre>%(rule)s</pre>
                 ''')%dict(col=col, rule=prepare_string_for_xml(rule))
             elif self.rule_kind == 'emblem':
                 return _('''
-                <p>Advanced Rule:
+                <p>Advanced rule:
                 <pre>%(rule)s</pre>
                 ''')%dict(rule=prepare_string_for_xml(rule))
             else:
                 return _('''
-                <p>Advanced Rule: set <b>%(typ)s</b> for column <b>%(col)s</b>:
+                <p>Advanced rule: set <b>%(typ)s</b> for column <b>%(col)s</b>:
                 <pre>%(rule)s</pre>
                 ''')%dict(col=col,
                           typ=trans_kind,
@@ -887,10 +887,10 @@ class EditRules(QWidget):  # {{{
         l1.setWordWrap(True)
         l.addWidget(l1, l.rowCount(), 0, 1, 2)
 
-        self.add_button = QPushButton(QIcon(I('plus.png')), _('Add Rule'),
+        self.add_button = QPushButton(QIcon(I('plus.png')), _('Add rule'),
                 self)
         self.remove_button = QPushButton(QIcon(I('minus.png')),
-                _('Remove Rule(s)'), self)
+                _('Remove rule(s)'), self)
         self.add_button.clicked.connect(self.add_rule)
         self.remove_button.clicked.connect(self.remove_rule)
         l.addWidget(self.add_button, l.rowCount(), 0)
@@ -920,7 +920,7 @@ class EditRules(QWidget):  # {{{
         l.setRowStretch(l.rowCount() - 1, 10)
 
         self.add_advanced_button = b = QPushButton(QIcon(I('plus.png')),
-                _('Add Advanced Rule'), self)
+                _('Add advanced rule'), self)
         b.clicked.connect(self.add_advanced)
         self.hb = hb = QHBoxLayout()
         l.addLayout(hb, l.rowCount(), 0, 1, 2)
@@ -945,20 +945,20 @@ class EditRules(QWidget):  # {{{
             text = _(
                 'You can control the color of columns in the'
                 ' book list by creating "rules" that tell calibre'
-                ' what color to use. Click the Add Rule button below'
+                ' what color to use. Click the "Add rule" button below'
                 ' to get started.<p>You can <b>change an existing rule</b> by'
                 ' double clicking it.')
         elif pref_name == 'column_icon_rules':
             text = _(
                 'You can add icons to columns in the'
                 ' book list by creating "rules" that tell calibre'
-                ' what icon to use. Click the Add Rule button below'
+                ' what icon to use. Click the "Add rule" button below'
                 ' to get started.<p>You can <b>change an existing rule</b> by'
                 ' double clicking it.')
         elif pref_name == 'cover_grid_icon_rules':
             text = _('You can add emblems (small icons) that are displayed on the side of covers'
                      ' in the cover grid by creating "rules" that tell calibre'
-                ' what image to use. Click the Add Rule button below'
+                ' what image to use. Click the "Add rule" button below'
                 ' to get started.<p>You can <b>change an existing rule</b> by'
                 ' double clicking it.')
             self.enabled.setVisible(True)

src/calibre/gui2/preferences/create_custom_column.py

@@ -406,7 +406,7 @@ class CreateCustomColumn(QDialog):
                     "<p>Date format. Use 1-4 \'d\'s for day, 1-4 \'M\'s for month, and 2 or 4 \'y\'s for year.</p>\n"
                     "<p>For example:\n"
                     "<ul>\n"
-                    "<li> ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
+                    "<li>ddd, d MMM yyyy gives Mon, 5 Jan 2010<li>\n"
                     "<li>dd MMMM yy gives 05 January 10</li>\n"
                     "</ul> "))
             else:

src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Advanced Search</string>
+   <string>Advanced search</string>
   </property>
   <property name="windowIcon">
    <iconset>
@@ -54,7 +54,7 @@
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
-       <string>A&amp;dvanced Search</string>
+       <string>A&amp;dvanced search</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="0" column="0">