Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / preferences / cataloguing.pref

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 6dc6fa2..4fc1305 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -9,8 +9,8 @@ Cataloging:
         -
             - pref: advancedMARCeditor
               choices:
-                  yes: Display
-                  no: "Don't display"
+                  yes: "Don't display"
+                  no: Display
             - descriptions of fields and subfields in the MARC editor.
     Spine Labels:
         -
@@ -25,6 +25,13 @@ Cataloging:
             - (Enter in columns from the <code>biblio</code>, <code>biblioitems</code> or <code>items</code> tables, surrounded by &lt; and &gt;.)
             - pref: SpineLabelFormat
               type: textarea
+        -
+            - pref: SpineLabelShowPrintOnBibDetails
+              choices:
+                  yes: Display
+                  no:  "Don't display"
+            - buttons on the bib details page to print item spine labels.
+        -
     Record Structure:
         -
             - Interpret and store MARC records in the
@@ -32,6 +39,7 @@ Cataloging:
               choices:
                   MARC21: MARC21
                   UNIMARC: UNIMARC
+                  NORMARC: NORMARC
             - format.
         -
             - Use the item type of the
@@ -45,10 +53,21 @@ Cataloging:
             - pref: itemcallnumber
             - "to an item's callnumber. (This can contain multiple subfields to look in; for instance <code>082ab</code> would look in 082 subfields a and b.)<br />Examples: <strong>Dewey</strong>: <code>082ab</code> or <code>092ab</code>; <strong>LOC</strong>: <code>050ab</code> or <code>090ab</code>; <strong>from the item record</strong>: <code>852hi</code>"
         -
+            - Display MARC subfield
+            - pref: AlternateHoldingsField
+            - "as holdings information for records that do not have items (This can contain multiple subfields to look in; for instance <code>852abhi</code> would look in 852 subfields a, b, h, and i.), with the subfields separated by"
+            - pref: AlternateHoldingsSeparator
+            - "."
+        -
             - Fill in the <a href="http://www.loc.gov/marc/organizations/orgshome.html">MARC organization code</a>
             - pref: MARCOrgCode
             - by default in new MARC records (leave blank to disable).
         -
+            - When items are created, give them the temporary location of
+            - pref: NewItemsDefaultLocation
+              class: short
+            - (should be a location code, or blank to disable).
+        -
             - pref: z3950NormalizeAuthor
               choices:
                   yes: Copy
@@ -58,25 +77,30 @@ Cataloging:
               class: multi
             - tags (separated by commas) to the correct author tags when importing a record using Z39.50.
         -
-            - pref: RoutingSerials
-              choices:
-                  yes: Add
-                  no: "Don't add"
-            - extra information to items automatically added to serials.
-        -
             - Barcodes are
             - pref: autoBarcode
               choices:
                   incremental: generated in the form 1, 2, 3.
                   annual: generated in the form &lt;year&gt;-0001, &lt;year&gt;-0002.
                   hbyymmincr: generated in the form &lt;branchcode&gt;yymm0001.
-                  OFF: not generated automatically.
+                  "OFF": not generated automatically.
     Display:
         -
+            - 'Separate multiple displayed authors, series or subjects with '
+            - pref: authoritysep
+              class: short
+            - '.'
+        -
             - Show
             - pref: URLLinkText
             - as the text of links embedded in MARC records.
         -
+            - pref: UseControlNumber
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - record control number ($w subfields) and control number (001) for linking of bibliographic records.
+        -
             - pref: hide_marc
               choices:
                   yes: "Don't display"
@@ -92,8 +116,9 @@ Cataloging:
             - By default, display biblio records in
             - pref: IntranetBiblioDefaultView
               choices:
-                  default: normal form.
+                  normal: normal form.
                   marc: MARC form.
+                  labeled_marc: Labelled MARC form
                   isbd: ISBD form (see below).
         -
             - "Use the following as the ISBD template:"
@@ -106,14 +131,4 @@ Cataloging:
                   yes: Hide
                   no: "Don't hide"
             - items marked as suppressed from OPAC search results. Note that you must have the <code>Suppress</code> index set up in Zebra and at least one suppressed item, or your searches will be broken.
-        - 
-            - Show the
-            - pref: StaffSerialIssueDisplayCount
-              class: integer
-            - previous issues of a serial on the staff client.
-        - 
-            - Show the
-            - pref: OPACSerialIssueDisplayCount
-              class: integer
-            - previous issues of a serial on the OPAC.