Merge remote-tracking branch 'kc/master' into merged_5549

[koha.git] / 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 02f1d77..ae6b620 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
@@ -317,7 +317,7 @@ OPAC:
               choices:
                   yes: "Don't allow"
                   no: Allow
-            - patrons to select their branch on the OPAC.
+            - patrons to select their library on the OPAC.
         -
             - pref: SearchMyLibraryFirst
               choices:
@@ -352,9 +352,9 @@ OPAC:
             - Use 
             - pref: OpacRenewalBranch
               choices:
-                  itemhomebranch: "the item's home branch"
-                  patronhomebranch: "the patron's home branch"
-                  checkoutbranch: "the branch the item was checked out from"
+                  itemhomebranch: "the item's home library"
+                  patronhomebranch: "the patron's home library"
+                  checkoutbranch: "the library the item was checked out from"
                   null: "NULL"
                   opacrenew: "'OPACRenew'"
             - as branchcode to store in the statistics table.
@@ -375,12 +375,26 @@ OPAC:
               choices:
                   no: "Don't allow"
                   yes: Allow
-            - patrons to select branch when making a purchase suggestion
+            - patrons to select library when making a purchase suggestion
         -
             - pref: OpacHiddenItems
               type: textarea
               class: code
-            - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.
+            - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations
+        -
+            - pref: OpacAllowPublicListCreation
+              default: 1
+              choices:
+                  no: "Don't allow"
+                  yes: Allow
+            - opac users to create public lists
+        -
+            - pref: OpacAllowSharingPrivateLists
+              default: 0
+              choices:
+                  no: "Don't allow"
+                  yes: Allow
+            - opac users to share private lists with other patrons. This feature is not active yet but will be released soon
 
     Privacy:
         -
@@ -435,7 +449,7 @@ OPAC:
               choices:
                   yes: Use
                   no: "Don't use"
-            - "the item home branch when finding items for the shelf browser."      
+            - "the item home library when finding items for the shelf browser."
         -
             - pref: ShelfBrowserUsesCcode
               default: 0