From 757d859904d2b3d2715af0ee427b6b683f0137f0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 21 Apr 2017 09:19:34 +0530 Subject: [PATCH] String changes --- .../ebooks/conversion/plugins/txt_input.py | 2 +- .../gui2/dialogs/saved_search_editor.ui | 4 ++-- src/calibre/gui2/dialogs/search.ui | 2 +- src/calibre/gui2/dialogs/smartdevice.ui | 2 +- src/calibre/gui2/preferences/coloring.py | 18 +++++++++--------- .../gui2/preferences/create_custom_column.py | 2 +- .../stores/mobileread/adv_search_builder.ui | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/txt_input.py b/src/calibre/ebooks/conversion/plugins/txt_input.py index 81b5543d6b..f8026ca194 100644 --- a/src/calibre/ebooks/conversion/plugins/txt_input.py +++ b/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' diff --git a/src/calibre/gui2/dialogs/saved_search_editor.ui b/src/calibre/gui2/dialogs/saved_search_editor.ui index 7ffa613015..fbfc941249 100644 --- a/src/calibre/gui2/dialogs/saved_search_editor.ui +++ b/src/calibre/gui2/dialogs/saved_search_editor.ui @@ -11,7 +11,7 @@ - Saved Search Editor + Saved search editor @@ -48,7 +48,7 @@ - Saved Search: + Saved search: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui index b2ee849dac..db9129d02b 100644 --- a/src/calibre/gui2/dialogs/search.ui +++ b/src/calibre/gui2/dialogs/search.ui @@ -201,7 +201,7 @@ - Titl&e/Author/Series ... + Titl&e/Author/Series... diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui index 132b7d0dc2..4f680d7009 100644 --- a/src/calibre/gui2/dialogs/smartdevice.ui +++ b/src/calibre/gui2/dialogs/smartdevice.ui @@ -46,7 +46,7 @@ - Calibre IP addresses: + calibre IP addresses: diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py index 1bac85d0dd..9504d437d0 100644 --- a/src/calibre/gui2/preferences/coloring.py +++ b/src/calibre/gui2/preferences/coloring.py @@ -799,17 +799,17 @@ class RulesModel(QAbstractListModel): # {{{ if not isinstance(rule, Rule): if kind == 'color': return _(''' -

Advanced Rule for column %(col)s: +

Advanced rule for column %(col)s: 

%(rule)s
''')%dict(col=col, rule=prepare_string_for_xml(rule)) elif self.rule_kind == 'emblem': return _(''' -

Advanced Rule: +

Advanced rule: 

%(rule)s
''')%dict(rule=prepare_string_for_xml(rule)) else: return _(''' -

Advanced Rule: set %(typ)s for column %(col)s: +

Advanced rule: set %(typ)s for column %(col)s: 

%(rule)s
''')%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.

You can change an existing rule 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.

You can change an existing rule 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.

You can change an existing rule by' ' double clicking it.') self.enabled.setVisible(True) diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index f6cfd2c357..10cb7be7bc 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -406,7 +406,7 @@ class CreateCustomColumn(QDialog): "

Date format. Use 1-4 \'d\'s for day, 1-4 \'M\'s for month, and 2 or 4 \'y\'s for year.

\n" "

For example:\n" "

    \n" - "
  • ddd, d MMM yyyy gives Mon, 5 Jan 2010
  • \n" + "
  • ddd, d MMM yyyy gives Mon, 5 Jan 2010
  • \n" "
  • dd MMMM yy gives 05 January 10
    • \n" "
")) else: diff --git a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui index 9c2142835f..07faa65703 100644 --- a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui +++ b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui @@ -11,7 +11,7 @@ - Advanced Search + Advanced search @@ -54,7 +54,7 @@ - A&dvanced Search + A&dvanced search