diff --git a/setup/iso_639-3.json b/setup/iso_639-3.json index 0bd0ad6991..b38771d3d6 100644 --- a/setup/iso_639-3.json +++ b/setup/iso_639-3.json @@ -2271,7 +2271,7 @@ }, { "alpha_3": "arx", - "name": "Aruá (Rodonia State)", + "name": "Aruá (Rondonia State)", "scope": "I", "type": "L" }, diff --git a/src/calibre/ebooks/html_transform_rules.py b/src/calibre/ebooks/html_transform_rules.py index ee1e2489f3..eee54c3e6b 100644 --- a/src/calibre/ebooks/html_transform_rules.py +++ b/src/calibre/ebooks/html_transform_rules.py @@ -23,7 +23,7 @@ ACTION_MAP = {a.name: a for a in ( Action('remove_classes', _('Remove classes'), _('Remove the specified classes, for e.g:') + ' bold green', _('Space separated class names')), Action('wrap', _('Wrap the tag'), _( 'Wrap the tag in the specified tag, for example: {0} will wrap the tag in a DIV tag with class {1}').format( - '<div class="box">', 'box'), _('A HTML opening tag')), + '<div class="box">', 'box'), _('An HTML opening tag')), Action('remove_attrs', _('Remove attributes'), _( 'Remove the specified attributes from the tag. Multiple attribute names should be separated by spaces'), _('Space separated attribute names')), Action('add_attrs', _('Add attributes'), _('Add the specified attributes, for e.g.:') + ' class="red" name="test"', _('Space separated attribute names')), diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py index b02258ae69..14c218228f 100644 --- a/src/calibre/gui2/dialogs/quickview.py +++ b/src/calibre/gui2/dialogs/quickview.py @@ -322,9 +322,9 @@ class Quickview(QDialog, Ui_Quickview): def show_item_context_menu(self, point): item = self.items.currentItem() self.context_menu = QMenu(self) - self.context_menu.addAction(self.search_icon, _('Search for item in the Tag browser'), + self.context_menu.addAction(self.search_icon, _('Find item in the Tag browser'), partial(self.item_doubleclicked, item)) - self.context_menu.addAction(self.search_icon, _('Search for item in the library'), + self.context_menu.addAction(self.search_icon, _('Find item in the library'), partial(self.do_search, follow_library_view=False)) self.context_menu.popup(self.items.mapToGlobal(point)) self.context_menu = QMenu(self) @@ -342,7 +342,7 @@ class Quickview(QDialog, Ui_Quickview): a = m.addAction(self.select_book_icon, _('Select this book in the library'), partial(self.select_book, book_id)) a.setEnabled(book_displayed) - m.addAction(self.search_icon, _('Search for item in the library'), + m.addAction(self.search_icon, _('Find item in the library'), partial(self.do_search, follow_library_view=False)) a = m.addAction(self.edit_metadata_icon, _('Edit metadata'), partial(self.edit_metadata, book_id, follow_library_view=False)) diff --git a/src/calibre/gui2/html_transform_rules.py b/src/calibre/gui2/html_transform_rules.py index 13e9e15ec8..fcf27a6b16 100644 --- a/src/calibre/gui2/html_transform_rules.py +++ b/src/calibre/gui2/html_transform_rules.py @@ -202,7 +202,7 @@ class RuleEdit(QWidget): # {{{ if self.query_help_label.isVisible(): if mt == 'css': url = 'https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors' - text = _('CSS Selector help') + text = _('CSS selector help') else: url = localize_user_manual_link('https://manual.calibre-ebook.com/xpath.html') text = _('XPath selector help') diff --git a/src/calibre/gui2/keyboard.py b/src/calibre/gui2/keyboard.py index 27643cc25a..9477999427 100644 --- a/src/calibre/gui2/keyboard.py +++ b/src/calibre/gui2/keyboard.py @@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en' from collections import OrderedDict from functools import partial +from gettext import pgettext from qt.core import (QObject, QKeySequence, QAbstractItemModel, QModelIndex, QItemSelectionModel, Qt, QStyledItemDelegate, QTextDocument, QStyle, pyqtSignal, QFrame, QAbstractItemView, QMenu, @@ -133,7 +134,7 @@ class Manager(QObject): # {{{ 'default_keys':tuple(default_keys), 'persist_shortcut':persist_shortcut} self.shortcuts[unique_name] = shortcut - group = group if group else _('Miscellaneous') + group = group if group else pgettext('keyboard shortcuts', _('Miscellaneous')) self.groups[group] = self.groups.get(group, []) + [unique_name] def unregister_shortcut(self, unique_name): diff --git a/src/calibre/gui2/search_restriction_mixin.py b/src/calibre/gui2/search_restriction_mixin.py index 785d6310f0..091303c94e 100644 --- a/src/calibre/gui2/search_restriction_mixin.py +++ b/src/calibre/gui2/search_restriction_mixin.py @@ -6,6 +6,7 @@ __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' from functools import partial +from gettext import pgettext from qt.core import ( Qt, QMenu, QIcon, QDialog, QGridLayout, QLabel, QLineEdit, QComboBox, QFrame, @@ -322,7 +323,7 @@ class SearchRestrictionMixin: self.addAction(self.current_search_action) self.keyboard.register_shortcut( 'vl-from-current-search', _('Virtual library from current search'), description=_( - 'Create a temporary Virtual library from the current search'), group=_('Miscellaneous'), + 'Create a temporary Virtual library from the current search'), group=pgettext('search restriction group name', 'Miscellaneous'), default_keys=('Ctrl+*',), action=self.current_search_action) self.search_based_vl_name = None diff --git a/src/calibre/gui2/tweak_book/file_list.py b/src/calibre/gui2/tweak_book/file_list.py index cff4731669..0a2dfbb5c7 100644 --- a/src/calibre/gui2/tweak_book/file_list.py +++ b/src/calibre/gui2/tweak_book/file_list.py @@ -8,6 +8,7 @@ import posixpath import sys import textwrap from collections import Counter, OrderedDict, defaultdict +from gettext import pgettext from functools import partial from qt.core import ( QApplication, QCheckBox, QDialog, QDialogButtonBox, QFont, QFormLayout, QItemSelectionModel, @@ -56,7 +57,7 @@ CATEGORIES = ( ('styles', _('Styles'), _('Style-')), ('images', _('Images'), _('Image-')), ('fonts', _('Fonts'), _('Font-')), - ('misc', _('Miscellaneous'), _('Misc-')), + ('misc', pgettext('edit book file type', 'Miscellaneous'), _('Misc-')), ) diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py index a1dff8a4dc..3b266a2da8 100644 --- a/src/calibre/gui2/tweak_book/ui.py +++ b/src/calibre/gui2/tweak_book/ui.py @@ -7,6 +7,7 @@ __copyright__ = '2013, Kovid Goyal ' import os from functools import partial +from gettext import pgettext from itertools import product from qt.core import ( QAction, QApplication, QColor, QDockWidget, QEvent, QHBoxLayout, QIcon, QImage, @@ -579,7 +580,7 @@ class Main(MainWindow): self.boss.next_spell_error, 'spell-next', ('F8'), _('Go to next spelling mistake')) # Miscellaneous actions - group = _('Miscellaneous') + group = pgettext('edit book actions', 'Miscellaneous') self.action_create_checkpoint = treg( 'marked.png', _('&Create checkpoint'), self.boss.create_checkpoint, 'create-checkpoint', (), _( 'Create a checkpoint with the current state of the book'))