Merge branch 'bug_9023' into 3.12-master

diff --git a/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt b/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt
index 83ce059..4cba418 100644 (file)
--- a/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt
+++ b/installer/data/mysql/de-DE/optional/sample_z3950_servers.txt
@@ -1,6 +1,4 @@
-Einige vorkonfigurierte Z39.50-Server
+Vorkonfigurierte Z39.50-Server:
 LIBRARY OF CONGRESS
-NEW YORK UNIVERSITY LIBRARIES
 COLUMBIA UNIVERSITY
-NEW YORK PUBLIC LIBRARY
 SMITHSONIAN INSTITUTION LIBRARIES

diff --git a/installer/data/mysql/en/mandatory/message_transport_types.txt b/installer/data/mysql/en/mandatory/message_transport_types.txt
index 3a8926a..bbbb3d5 100644 (file)
--- a/installer/data/mysql/en/mandatory/message_transport_types.txt
+++ b/installer/data/mysql/en/mandatory/message_transport_types.txt
@@ -1,2 +1,2 @@
-defines default message tranports for email, and sms.
+Defines default message tranports for email and sms.
 

diff --git a/installer/data/mysql/en/mandatory/sample_notices.txt b/installer/data/mysql/en/mandatory/sample_notices.txt
index 82e2ff8..c195b10 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices.txt
+++ b/installer/data/mysql/en/mandatory/sample_notices.txt
@@ -1 +1 @@
-Sample Notices
+Sample notices

diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt b/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
index 770bcac..5a326f4 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
+++ b/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
@@ -1,2 +1 @@
-defines default messages for items due, advance notices, and upcoming library events.
-
+Defines default messages for the enhanced messaging configuration.

diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt b/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
index 18e3431..74cea36 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
+++ b/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
@@ -1,3 +1,2 @@
-Defines default message transports for sending item due messages,
-advance notice messages, and library event messages through email
-and SMS.
+Defines default message transports for sending item due messages and
+advance notice messages through email and SMS.

diff --git a/installer/data/mysql/en/mandatory/subtag_registry.txt b/installer/data/mysql/en/mandatory/subtag_registry.txt
index 5648982..107bfd7 100644 (file)
--- a/installer/data/mysql/en/mandatory/subtag_registry.txt
+++ b/installer/data/mysql/en/mandatory/subtag_registry.txt
@@ -1,5 +1,5 @@
-Koha I18N Support
+Koha I18N support
 
 BIDI Stuff, Arabic and Hebrew
 Default mappings between script and language subcodes
-Language Extensions
+Language extensions

diff --git a/installer/data/mysql/en/optional/auth_val.txt b/installer/data/mysql/en/optional/auth_val.txt
index c234c3f..bc23678 100644 (file)
--- a/installer/data/mysql/en/optional/auth_val.txt
+++ b/installer/data/mysql/en/optional/auth_val.txt
@@ -1 +1 @@
-Some basic default authorised values for Library Departments, Item Lost status, etc. You can change these at any time after installation.
+Some basic default authorised values for library locations, item lost status, etc. You can change these at any time after installation.

diff --git a/installer/data/mysql/en/optional/marc21_holdings_coded_values.txt b/installer/data/mysql/en/optional/marc21_holdings_coded_values.txt
index ce1b6f4..7fa02cc 100644 (file)
--- a/installer/data/mysql/en/optional/marc21_holdings_coded_values.txt
+++ b/installer/data/mysql/en/optional/marc21_holdings_coded_values.txt
@@ -1,2 +1,2 @@
-Coded values conforming to the Z39.71-2006 Holdings Statements for Bibliographic Items
+Coded values conforming to the Z39.71-2006 holdings statements for bibliographic items.
 Refer to http://www.niso.org/standards/index.html for details.

diff --git a/installer/data/mysql/en/optional/marc21_relatorterms.txt b/installer/data/mysql/en/optional/marc21_relatorterms.txt
index ef8264b..5cbf709 100644 (file)
--- a/installer/data/mysql/en/optional/marc21_relatorterms.txt
+++ b/installer/data/mysql/en/optional/marc21_relatorterms.txt
@@ -1 +1 @@
-MARC Code List for Relators, as of http://www.loc.gov/marc/relators/relaterm.html
+MARC code list for relators, as of http://www.loc.gov/marc/relators/relaterm.html

diff --git a/installer/data/mysql/en/optional/patron_categories.txt b/installer/data/mysql/en/optional/patron_categories.txt
index ccb7f40..b94941a 100644 (file)
--- a/installer/data/mysql/en/optional/patron_categories.txt
+++ b/installer/data/mysql/en/optional/patron_categories.txt
@@ -1,25 +1,25 @@
 Sample patron types and categories: 
 
-Type:                  Categories:
+Type:           Categories:
 
-Adult Patron - default patron type
-                               PT      - Patron
-                               ST      - Student
-                               BH      - Homebound
+Adult patron - default patron type
+                PT  - Patron
+                ST  - Student
+                BH  - Homebound
 
 Child - patron with a guarantor
-                               K       - Kid
-                               J       - Juvenile
-                               YA      - Young Adult
+                K   - Kid
+                J   - Juvenile
+                YA  - Young Adult
 
 Organization - patron is an institution, not a person
-                               ILL - Inter-library Loan
-                               SC      - School
-                               L       - Library
+                ILL - Inter-library Loan
+                SC  - School
+                L   - Library
 
 Professional - a member of an organization (organization is guarantor)
-                               T       - Teacher
-                               S       - Staff
-                               B       - Board
+                T   - Teacher
+                S   - Staff
+                B   - Board
 
 Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module.

diff --git a/installer/data/mysql/en/optional/sample_creator_data.txt b/installer/data/mysql/en/optional/sample_creator_data.txt
index 0c7f62f..7dc5fcf 100644 (file)
--- a/installer/data/mysql/en/optional/sample_creator_data.txt
+++ b/installer/data/mysql/en/optional/sample_creator_data.txt
@@ -1 +1 @@
-Sample Label and Patron Card Data
+Sample label and patron card data

diff --git a/installer/data/mysql/en/optional/sample_holidays.txt b/installer/data/mysql/en/optional/sample_holidays.txt
index dacc9b3..a2d2de9 100644 (file)
--- a/installer/data/mysql/en/optional/sample_holidays.txt
+++ b/installer/data/mysql/en/optional/sample_holidays.txt
@@ -1,4 +1,4 @@
-Sample Holidays:
+Sample holidays:
        Sundays
        Christmas
        New Year's

diff --git a/installer/data/mysql/en/optional/sample_itemtypes.txt b/installer/data/mysql/en/optional/sample_itemtypes.txt
index f2b0bcc..1af4c51 100644 (file)
--- a/installer/data/mysql/en/optional/sample_itemtypes.txt
+++ b/installer/data/mysql/en/optional/sample_itemtypes.txt
@@ -1 +1 @@
-A set of default item types (material types and collection codes).
+A set of default item types.

diff --git a/installer/data/mysql/en/optional/sample_libraries.txt b/installer/data/mysql/en/optional/sample_libraries.txt
index 97953d0..cbaf05c 100644 (file)
--- a/installer/data/mysql/en/optional/sample_libraries.txt
+++ b/installer/data/mysql/en/optional/sample_libraries.txt
@@ -1 +1 @@
-A few sample libraries, and library categories, including examples of the hardcoded types, CU, IS, PE.
+A few sample libraries.

diff --git a/installer/data/mysql/en/optional/sample_news.txt b/installer/data/mysql/en/optional/sample_news.txt
index cc1e3e6..8848aa3 100644 (file)
--- a/installer/data/mysql/en/optional/sample_news.txt
+++ b/installer/data/mysql/en/optional/sample_news.txt
@@ -1 +1 @@
-Sample News Items
+Sample news items

diff --git a/installer/data/mysql/en/optional/sample_quotes.txt b/installer/data/mysql/en/optional/sample_quotes.txt
index b8b2c2d..18ac7cf 100644 (file)
--- a/installer/data/mysql/en/optional/sample_quotes.txt
+++ b/installer/data/mysql/en/optional/sample_quotes.txt
@@ -1 +1 @@
-Sample Quotes
+Sample quotes

diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.txt b/installer/data/mysql/en/optional/sample_z3950_servers.txt
index 121badd..89d7250 100644 (file)
--- a/installer/data/mysql/en/optional/sample_z3950_servers.txt
+++ b/installer/data/mysql/en/optional/sample_z3950_servers.txt
@@ -1,5 +1,3 @@
 LIBRARY OF CONGRESS
-NEW YORK UNIVERSITY LIBRARIES
 COLUMBIA UNIVERSITY
-NEW YORK PUBLIC LIBRARY
 SMITHSONIAN INSTITUTION LIBRARIES

diff --git a/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt b/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt
index 121badd..89d7250 100644 (file)
--- a/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt
+++ b/installer/data/mysql/es-ES/optional/sample_z3950_servers.txt
@@ -1,5 +1,3 @@
 LIBRARY OF CONGRESS
-NEW YORK UNIVERSITY LIBRARIES
 COLUMBIA UNIVERSITY
-NEW YORK PUBLIC LIBRARY
 SMITHSONIAN INSTITUTION LIBRARIES

diff --git a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt
index 6bbd894..47ba7ae 100644 (file)
--- a/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt
+++ b/installer/data/mysql/pl-PL/optional/sample_z3950_servers.txt
@@ -1,5 +1,3 @@
 BIBLIOTEKA NARODOWA
 BIBLIOTEKA PUBLICZNA DZIELNICY BEMOWO
 LIBRARY OF CONGRESS
-NEW YORK UNIVERSITY LIBRARIES
-NEW YORK PUBLIC LIBRARY