Merge branch 'release-2.3'

Conflicts:
	languages/ca.ini

languages/en-gb.ini

 ; For future reference:
 ;English = English
-@parent_ini = en.ini
+@parent_ini = "en.ini"
 Add to favorites = "Add to Favourites"
 add_favorite_suffix = "to favourites"
-adv_search_callnumber   = "Classmarks"
+adv_search_callnumber = "Classmarks"
 Browse the Catalog = "Browse the Catalogue"
 browse_dewey = "Classmark (Dewey)"
 bulk_email_title = "Library Catalogue Items"
 By Call Number = "By Classmark"
 Call Number = "Classmark"
+cat_password_abbrev = "Catalogue Password"
+cat_username_abbrev = "Catalogue Username"
 Catalog Login = "Catalogue Login"
 Catalog Results = "Catalogue Results"
 catalog_login_desc = "Enter your library catalogue credentials."
-cat_password_abbrev = "Catalogue Password"
-cat_username_abbrev = "Catalogue Username"
 delete_selected_favorites = "Delete Selected Favourites"
 email_selected_favorites = "Email Selected Favourites"
 Export Favorites = "Export Favourites"
 export_selected_favorites = "Export Selected Favourites"
-Favorites = Favourites
 fav_delete = "Delete Selected Favourites"
 fav_delete_deleting = "Your favourite(s) are being deleted."
 fav_delete_fail = "Sorry, an error has occurred. Your favourite(s) were not deleted."
@@ -29,6 +28,7 @@ fav_email_fail = "Sorry, an error has occurred. Your favourite(s) were not e-mai
 fav_email_missing = "Some data was missing. Your favourite(s) were not emailed."
 fav_email_success = "Your favourite(s) were emailed as requested."
 fav_export = "Export Favourites"
+Favorites = "Favourites"
 hold_available = "Available for Collection"
 hold_cancel_fail = "Your request was not cancelled. Please contact the issue desk for further assistance"
 hold_cancel_success = "Your request was successfully cancelled"

languages/native.ini

 ; language names translated into their native forms -- used by selection drop-down
-Basque = Euskara
+Basque = "Euskara"
 Brazilian Portugese = "Português (Brasil)"
-Catalan = Català
+Catalan = "Català"
 Chinese = "中文（繁體）"
-Czech = čeština
-Danish = Dansk
-Dutch = Nederlands
-English = English
+Czech = "čeština"
+Danish = "Dansk"
+Dutch = "Nederlands"
+English = "English"
 Finnish = "Suomi"
-French = Français
-German = Deutsch
-Greek = Ελληνικά
-Hebrew = עברית
-Irish = Gaeilge
-Italian = Italiano
-Japanese = 日本語
-Polish = polski
+French = "Français"
+German = "Deutsch"
+Greek = "Ελληνικά"
+Hebrew = "עברית"
+Irish = "Gaeilge"
+Italian = "Italiano"
+Japanese = "日本語"
+Polish = "polski"
 Portuguese = "Português"
-Russian = Русский
+Russian = "Русский"
 Simplified Chinese = "中文(简体)"
-Slovene = slovenščina
-Spanish = Español
-Swedish = Svenska
-Turkish = Türkçe
-Welsh = "Cymraeg"
+Slovene = "slovenščina"
+Spanish = "Español"
+Swedish = "Svenska"
+Turkish = "Türkçe"
+Welsh = "Cymraeg"
\ No newline at end of file