From 02b34ab54414430b804143ab0e61fea185bd5983 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 30 May 2020 04:14:58 +0000
Subject: [PATCH] Bug 25630: Fix capitalization and terminology for Authorities
 and Cataloging system preferences

- Punctuation (p)
- Terminology
- Capitalization (c)

To test:
- Verify:
  - AuthDisplayHierarchy (biblio to bibliographic)
  - MARCAuthorityControlField008 (p)
  - UNIMARCAuthorityField100 (p)
  - LinkerModule (c)
  - LinkerOptions (p)
  - SpineLabelShowPrintOnBibDetails (bib to bibliographic)
  - DefaultLanguageField008 (p)
  - DefaultCountryField008 (p)
  - SubfieldsToAllowForRestricted* (p, rephrase)
  - URLLinkText (added 'and items' - new with 20.05)
  - IntranetBiblioDefaultView (c)
  - MergeReportFields (rephrase)
  - BibtexExportAdditionalFields (marc to MARC)

Signed-off-by: David Nind <david@davidnind.com>
---
 .../en/modules/admin/preferences/authorities.pref  | 12 ++++----
 .../en/modules/admin/preferences/cataloguing.pref  | 35 +++++++++++-----------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
index 27734a2301..9b6f571635 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
@@ -8,7 +8,7 @@ Authorities:
                   no: "Don't display"
             - broader term/narrower term hierarchies when viewing authorities.
         -
-            - Use the following text to edit how authority records control indicators of attached biblio fields (and possibly subfield $2).<br>
+            - Use the following text to edit how authority records control indicators of attached bibliographic fields (and possibly subfield $2).<br>
             - "Lines starting with a comment symbol (#) are skipped. Each line should be of the form: (marc21|unimarc), tag, ind1:(auth1|auth2|some_value), ind2:(auth1|auth2|thesaurus|some_value).<br>"
             - Here auth1 and auth2 refer to the indicators of the authority record, tag is a biblio field number or an asterisk (*), and some_value is a fixed value (one character).<br>
             - The MARC21 option thesaurus refers to indicators controlled by authority field 008/11 and 040$f.
@@ -37,7 +37,7 @@ Authorities:
             - records. (Above this limit, the merge_authority cron job will merge them.)
             - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/merge_authorities.pl</code> cronjob. Ask your system administrator to schedule it."
         -
-            - Use the following text for the contents of MARC21 authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05).
+            - "Use the following text for the contents of MARC21 authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05):"
             - pref: MARCAuthorityControlField008
               default: "|| aca||aabn           | a|a     d"
               type: textarea
@@ -50,7 +50,7 @@ Authorities:
                   no: "Don't use"
             - authority record numbers instead of text strings for searches from subject tracings.
         -
-            - Use the following text for the contents of UNIMARC authority field 100 position 08-35 (fixed length data elements). Do NOT include the date (position 00-07).
+            - "Use the following text for the contents of UNIMARC authority field 100 position 08-35 (fixed length data elements). Do NOT include the date (position 00-07):"
             - pref: UNIMARCAuthorityField100
               default: "afrey50      ba0"
               type: textarea
@@ -71,11 +71,11 @@ Authorities:
               default: Default
               choices:
                   Default: Default
-                  FirstMatch: "First Match"
-                  LastMatch: "Last Match"
+                  FirstMatch: "first match"
+                  LastMatch: "last match"
             - linker module for matching headings to authority records.
         -
-            - Set the following options for the authority linker
+            - "Set the following options for the authority linker:"
             - pref: LinkerOptions
               class: multi
             - (separate options with |)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index 475decfa4e..fe7f50ed53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -17,7 +17,7 @@ Cataloging:
               choices:
                   yes: Display
                   no: "Don't display"
-            - easy ways to create analytical record relationships
+            - "easy ways to create analytical record relationships."
         -
             - pref: EnableAdvancedCatalogingEditor
               default: 0
@@ -45,15 +45,15 @@ Cataloging:
               choices:
                   yes: Display
                   no:  "Don't display"
-            - buttons on the bib details page to print item spine labels.
+            - buttons on the bibliographic details page to print item spine labels.
         -
     Record structure:
         -
-            - Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)
+            - "Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href='http://www.loc.gov/marc/languages/language_code.html'>MARC Code List for Languages</a>):"
             - pref: DefaultLanguageField008
             - " Empty defaults to eng."
         -
-            - Fill in the default country code for field 008 Range 15-17 of MARC21 - Place of publication, production, or execution. See <a href="http://www.loc.gov/marc/countries/countries_code.html">MARC Code List for Countries</a>
+            - "Fill in the default country code for field 008 Range 15-17 of MARC21 - Place of publication, production, or execution. (See <a href='http://www.loc.gov/marc/countries/countries_code.html'>MARC Code List for Countries</a>):"
             - pref: DefaultCountryField008
             - " Empty defaults to xxu for United States."
         -
@@ -106,7 +106,7 @@ Cataloging:
                   incremental: generated in the form 1, 2, 3.
                   annual: generated in the form <year>-0001, <year>-0002.
                   hbyymmincr: generated in the form <branchcode>yymm0001.
-                  EAN13: incremental EAN-13 barcodes
+                  EAN13: incremental EAN-13 barcodes.
                   "OFF": not generated automatically.
         -
             - When a new item is added,
@@ -115,7 +115,7 @@ Cataloging:
                   yes: the new item is prefilled with last created item values.
                   no: the new item is not prefilled with last created item values.
         -
-            - Define a list of subfields to use when prefilling items (separated by space)
+            - "Define a list of subfields to use when prefilling items (separated by space):"
             - pref: SubfieldsToUseWhenPrefill
         -
             - Use the languague (ISO 690-2)
@@ -123,15 +123,15 @@ Cataloging:
               class: short
             - as default language in the UNIMARC field 100 when creating a new record or in the field plugin.
         -
-            - Define a list of subfields for which editing is authorized when edit_items_restricted permission is enabled, separated by spaces.
+            - "List of subfields for which editing is authorized when the edit_items_restricted permission is enabled, separated by spaces:"
             - pref: SubfieldsToAllowForRestrictedEditing
             - 'Examples:'
             - 'UNIMARC: "995$f 995$h 995$j"'
             - 'MARC21: "952$a 952$b 952$c"'
             - Note that the FA framework is excluded from the permission.
-            - If the pref is empty, no fields are restricted.
+            - If the system preference is empty, no fields are restricted.
         -
-            - Define a list of subfields for which editing is authorized when items_batchmod_restricted permission is enabled, separated by spaces.
+            - "List of subfields for which editing is authorized when the items_batchmod_restricted permission is enabled, separated by spaces:"
             - pref: SubfieldsToAllowForRestrictedBatchmod
             - 'Examples:'
             - 'UNIMARC: "995$f 995$h 995$j"'
@@ -143,11 +143,12 @@ Cataloging:
             - pref: MarcFieldForCreatorId
             - and record's creator name in MARC subfield
             - pref: MarcFieldForCreatorName
+            - "."
             - Store record's last modifier borrowernumber in MARC subfield
             - pref: MarcFieldForModifierId
             - and record's last modifier name in MARC subfield
             - pref: MarcFieldForModifierName
-            - "<br/>NOTE: Use a dollar sign between field and subfield like 123$a."
+            - ". <br/>NOTE: Use a dollar sign between field and subfield like 123$a."
     Display:
         -
             - 'Separate multiple displayed authors, series or subjects with '
@@ -157,7 +158,7 @@ Cataloging:
         -
             - Show
             - pref: URLLinkText
-            - as the text of links embedded in MARC records.
+            - as the text of links embedded in MARC records and items.
         -
             - pref: UseControlNumber
               choices:
@@ -190,10 +191,10 @@ Cataloging:
               choices:
                   normal: normal form.
                   marc: MARC form.
-                  labeled_marc: Labelled MARC form
+                  labeled_marc: labelled MARC form.
                   isbd: ISBD form (see below).
         -
-            - "Use the following as the staff ISBD template:"
+            - "Use the following as the staff interface ISBD template:"
             - pref: ISBD
               type: textarea
               syntax: text/html
@@ -213,7 +214,7 @@ Cataloging:
               choices:
                   yes: "an explanatory page ('This record is blocked')."
                   no: "the 404 error page ('Not found')."
-            - <br />Display the following message on the redirect page for suppressed bibliographic records
+            - "<br />Display the following message on the redirect page for suppressed bibliographic records:"
             - pref: OpacSuppressionMessage
               type: textarea
               class: code
@@ -221,7 +222,7 @@ Cataloging:
             - pref: SeparateHoldings
               choices:
                   yes: Separate
-                  no: Don't separate
+                  no: "Don't separate"
             - "items display into two tabs, where the first tab contains items whose"
             - pref: SeparateHoldingsBranch
               choices:
@@ -242,8 +243,8 @@ Cataloging:
                   no: "Don't display"
             - acquisition details on the bibliographic record detail page.
         -
+            - "Show the following fields for deleted records after a merge:"
             - pref: MergeReportFields
-            - "fields to display for deleted records after merge"
             - "<br />example: '001,245ab,600'"
             - "displays:"
             - "<ul>"
@@ -290,7 +291,7 @@ Cataloging:
               syntax: text/x-yaml
             - "Use one line per tag in the format RIS_TAG: TAG$SUBFIELD ( e.g. LC: 010$a )"
             - "<br/>"
-            - "To specificy multiple marc tags/subfields as targets for a repeating RIS tag, use the following format: RIS_TAG: [TAG2$SUBFIELD1, TAG2$SUBFIELD2] ( e.g. NT: [501$a, 505$g] )"
+            - "To specificy multiple MARC tags/subfields as targets for a repeating RIS tag, use the following format: RIS_TAG: [TAG2$SUBFIELD1, TAG2$SUBFIELD2] ( e.g. NT: [501$a, 505$g] )"
             - "<br/>"
             - "All values of repeating tags and subfields will be printed with the given RIS tag."
             - "<br/>"
-- 
2.11.0