Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

String changes

Browse Source
This commit is contained in:
Kovid Goyal 2020-03-13 22:56:59 +05:30
parent 8b473b8d9c
commit acbddd7845
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.yaml
View File

@ -1123,7 +1123,7 @@
- title: "Content server: Fix editing metadata that affects multiple books causing all the metadata for all the books to become the same." - title: "Content server: Fix editing metadata that affects multiple books causing all the metadata for all the books to become the same."
tickets: [1812781] tickets: [1812781]
- title: "Open With: Fix using .bat files as the program not working." - title: "Open with: Fix using .bat files as the program not working."
tickets: [1811045] tickets: [1811045]
- title: "ZIP Output: Fix an error when building the ToC on macOS for some books with non-ASCII ToC entries" - title: "ZIP Output: Fix an error when building the ToC on macOS for some books with non-ASCII ToC entries"

2
manual/drm.rst
View File

@ -16,7 +16,7 @@ the file or device, such as serial numbers or key-files. It can also refer to
restrictions associated with specific instances of digital works or devices. restrictions associated with specific instances of digital works or devices.
DRM technologies attempt to control use of digital media by preventing access, DRM technologies attempt to control use of digital media by preventing access,
copying or conversion to other formats by end users. See `wikipedia copying or conversion to other formats by end users. See `wikipedia
<http://en.wikipedia.org/wiki/Digital_rights_management>`_. <https://en.wikipedia.org/wiki/Digital_rights_management>`_.
What does DRM imply for me personally? What does DRM imply for me personally?

2
src/calibre/gui2/actions/edit_metadata.py
View File

@ -312,7 +312,7 @@ class EditMetadataAction(InterfaceAction):
intro_msg=_('The downloaded metadata is on the left and the original metadata' intro_msg=_('The downloaded metadata is on the left and the original metadata'
' is on the right. If a downloaded value is blank or unknown,' ' is on the right. If a downloaded value is blank or unknown,'
' the original value is used.'), ' the original value is used.'),
action_button=(_('&View Book'), I('view.png'), self.gui.iactions['View'].view_historical), action_button=(_('&View book'), I('view.png'), self.gui.iactions['View'].view_historical),
db=db db=db
) )
if d.exec_() == d.Accepted: if d.exec_() == d.Accepted:

2
src/calibre/gui2/book_details.py
View File

@ -212,7 +212,7 @@ def add_format_entries(menu, data, book_info):
else: else:
m.addSeparator() m.addSeparator()
m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(book_info.choose_open_with, book_id, fmt)) m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(book_info.choose_open_with, book_id, fmt))
m.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, book_info)) m.addAction(_('Edit Open with applications...'), partial(edit_programs, fmt, book_info))
menu.addMenu(m) menu.addMenu(m)
menu.ow = m menu.ow = m
if fmt.upper() in SUPPORTED: if fmt.upper() in SUPPORTED:

2
src/calibre/gui2/open_with.py
View File

@ -444,7 +444,7 @@ def register_keyboard_shortcuts(gui=None, finalize=False):
unique_name = application['uuid'] unique_name = application['uuid']
func = partial(gui.open_with_action_triggerred, filetype, application) func = partial(gui.open_with_action_triggerred, filetype, application)
ac.triggered.connect(func) ac.triggered.connect(func)
gui.keyboard.register_shortcut(unique_name, name, action=ac, group=_('Open With')) gui.keyboard.register_shortcut(unique_name, name, action=ac, group=_('Open with'))
gui.addAction(ac) gui.addAction(ac)
registered_shortcuts[unique_name] = ac registered_shortcuts[unique_name] = ac
if finalize: if finalize:

2
src/calibre/gui2/tweak_book/file_list.py
View File

@ -206,7 +206,7 @@ class OpenWithHandler(object): # {{{
else: else:
m.addSeparator() m.addSeparator()
m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(self.choose_open_with, file_name, fmt)) m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(self.choose_open_with, file_name, fmt))
m.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, self)) m.addAction(_('Edit Open with applications...'), partial(edit_programs, fmt, self))
menu.addMenu(m) menu.addMenu(m)
menu.ow = m menu.ow = m