From eac58bfc9e3c8bd0b4b1210ff49fed2777af5ba8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 27 Mar 2020 09:22:06 +0530 Subject: [PATCH] String changes --- Changelog.yaml | 2 +- manual/gui.rst | 2 +- src/calibre/gui2/preferences/adding.ui | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Changelog.yaml b/Changelog.yaml index f1587abc14..36f90cf539 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -1046,7 +1046,7 @@ - title: "Tag browser: Category editor: Add a checkbox to restrict the entries shown to only those present in the current Virtual library" - - title: "Allow adding files to selected book records from the clipboard. To use copy a file from windows explorer, right click the Add books button and choose: Add files to selected books from clipboard" + - title: "Allow adding files to selected book records from the clipboard. To use copy a file from windows explorer, right click the Add books button and choose: Add files to selected book records from clipboard" tickets: [1815419] - title: "Tag browser: When right clicking on a Saved search add a menu option to search using the raw search expression." diff --git a/manual/gui.rst b/manual/gui.rst index f5e67d51a6..01e595abf5 100644 --- a/manual/gui.rst +++ b/manual/gui.rst @@ -548,7 +548,7 @@ You can search User categories in the same way as built-in categories, by clicki 3. "everything not matching an item in the category" shown by a single red minus sign. 4. "everything not matching an item in the category or its sub-categories" shown by two red minus signs. -It is also possible to create hierarchies inside some of the text categories such as tags, series, and custom columns. These hierarchies show with the small triangle, permitting the sub-items to be hidden. To use hierarchies of items in a category, you must first go to :guilabel:`Preferences->Interface->Look & feel` and enter the category name(s) into the "Categories with hierarchical items" box. Once this is done, items in that category that contain periods will be shown using the small triangle. For example, assume you create a custom column called "Genre" and indicate that it contains hierarchical items. Once done, items such as Mystery.Thriller and Mystery.English will display as Mystery with the small triangle next to it. Clicking on the triangle will show Thriller and English as sub-items. See :ref:`Managing subgroups of books, for example "genre" ` for more information. +It is also possible to create hierarchies inside some of the text categories such as tags, series, and custom columns. These hierarchies show with the small triangle, permitting the sub-items to be hidden. To use hierarchies of items in a category, you must first go to :guilabel:`Preferences->Interface->Look & feel` and enter the category name(s) into the "Categories with hierarchical items" field. Once this is done, items in that category that contain periods will be shown using the small triangle. For example, assume you create a custom column called "Genre" and indicate that it contains hierarchical items. Once done, items such as Mystery.Thriller and Mystery.English will display as Mystery with the small triangle next to it. Clicking on the triangle will show Thriller and English as sub-items. See :ref:`Managing subgroups of books, for example "genre" ` for more information. Hierarchical items (items with children) use the same four 'click-on' searches as User categories. Items that do not have children use two of the searches: "everything matching" and "everything not matching". diff --git a/src/calibre/gui2/preferences/adding.ui b/src/calibre/gui2/preferences/adding.ui index 4255e281f3..00828f7b5b 100644 --- a/src/calibre/gui2/preferences/adding.ui +++ b/src/calibre/gui2/preferences/adding.ui @@ -163,13 +163,13 @@ Title match ignores leading indefinite articles ("the", "a", - Auto-merge: If books with similar titles and authors found, merge the incoming formats automatically into + Auto-merge: If books with similar titles and authors found, merge the incoming formats (files) automatically into existing book records. This box controls what happens when an existing record already has the incoming format: -Ignore duplicate incoming files - means that existing files in your calibre library will not be replaced -Overwrite existing duplicate files - means that existing files in your calibre library will be replaced -Create new record for each duplicate file - means that a new book entry will be created for each duplicate file +Ignore duplicate incoming formats - means that existing formats in your calibre library will not be replaced +Overwrite existing duplicate formats - means that existing formats in your calibre library will be replaced +Create new record for each duplicate formats - means that a new book entry will be created for each duplicate formats Title matching ignores leading indefinite articles ("the", "a", "an"), punctuation, case, etc. Author matching is exact.