Merge remote-tracking branch 'origin/new/bug_6875'

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

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 1872b6e..1acc414 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -130,12 +130,12 @@ OPAC:
             - Include the additional CSS stylesheet
             - pref: opaccolorstylesheet
               class: file
-            - to override specified settings from the default stylesheet. Enter the filename (if the file is in the server's css directory) or a complete URL beginning with <code>http://</code> (if the file lives on a remote server). Leave blank to disable.
+            - to override specified settings from the default stylesheet (leave blank to disable). Enter a filename or a complete URL beginning with <code>http://</code> (if the file lives on a remote server). Please note that if you enter a filename, the file should be in the css subdirectory for each active theme and language within the Koha templates directory.
         -
-            - Use the CSS stylesheet [% opacthemelang %]/css/
+            - Use the CSS stylesheet
             - pref: opaclayoutstylesheet
               class: file
-            - on all pages in the OPAC, instead of the default (leave blank to disable).
+            - on all pages in the OPAC, instead of the default (leave blank to disable). Please enter filename only. The file should be in the css subdirectory for each active theme and language within the Koha templates directory.
         -
             - Use the remote CSS stylesheet
             - pref: opacstylesheet
@@ -173,7 +173,7 @@ OPAC:
               class: code
         -
             - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
-            - '<br />Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
+            - '<br />Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN}, {ISSN} and {AUTHOR} will be replaced with information from the displayed record.'
             - pref: OPACSearchForTitleIn
               type: textarea
               class: code
@@ -214,7 +214,7 @@ OPAC:
               class: multi
             - '<br />Note: Available options are: BIBTEX (<code>bibtex</code>), Dublin Core (<code>dc</code>),'
             - 'MARCXML (<code>marcxml</code>), MARC-8 encoded MARC (<code>marc8</code>), Unicode/UTF-8 encoded MARC (<code>utf8</code>),'
-            - 'Unicode/UTF-8 encoded MARC without local use (9xx, x9x, xx9) fields and subfields (<code>marcstd</code>), MODS (<code>mods</code>), RIS (<code>ris</code>)'
+            - 'Unicode/UTF-8 encoded MARC without local use -9xx, x9x, xx9- fields and subfields (<code>marcstd</code>), MODS (<code>mods</code>), RIS (<code>ris</code>)'
     Features:
         -
             - pref: opacuserlogin
@@ -235,6 +235,12 @@ OPAC:
                   no: "Don't allow"
             - patrons to notify the library of changes to their contact information from the OPAC.
         -
+            - pref: OPACpatronimages
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - patron images on the patron information page in the OPAC.
+        -
             - pref: OPACFinesTab
               choices:
                   yes: Allow
@@ -277,11 +283,16 @@ OPAC:
                   no: "Don't allow"
             - patrons to make comments on items on the OPAC.
         -
+            - Show
             - pref: ShowReviewer
               choices:
-                  yes: Show
-                  no: Hide
-            - reviewer's name above comments in OPAC.
+                  none: no name
+                  full: full name
+                  first: first name
+                  surname: last name
+                  firstandinitial: first name and last name initial
+                  username: username
+            - of commenter with comments in OPAC.
         -
             - pref: ShowReviewerPhoto
               choices: