Merge branch 'release-2.3'

languages/de.ini

@@ -49,6 +49,7 @@ All Pages Loaded = "Alle Seiten geladen"
 All Text = "Alle Textfelder und Volltext"
 alphabrowse_matches = "Treffer"
 An error has occurred = "Es ist ein Fehler aufgetreten"
+An error occurred during execution; please try again later. = "Ein Fehler ist aufgetreten. Bitte versuchen Sie es später noch einmal."
 AND = "UND"
 anonymous_tags = "Anonyme Tags"
 APA Citation = "APA Zitierstil"
@@ -123,8 +124,8 @@ bulk_fail = "Leider ist ein Fehler aufgetreten. Versuchen Sie es später noch ei
 bulk_noitems_advice = "Es wurde nichts ausgewählt. Klicken Sie bitte in eine Auswahlbox neben einem Eintrag und versuchen Sie es erneut."
 bulk_save_error = "Fehlende Angaben. Ihre Auswahl wurde nicht gespeichert."
 bulk_save_success = "Ihre Auswahl wurde erfolgreich abgespeichert"
-by = "von"
 By = "von"
+by = "von"
 By Alphabetical = "Alphabetisch"
 By Author = "Nach Verfasser"
 By Call Number = "Nach Signatur"
@@ -631,6 +632,7 @@ Other Authors = "Weitere Verfasser"
 Other Editions = "Weitere Ausgaben"
 Other Libraries = "Weitere Bibliotheken"
 Other Sources = "Weitere Quellen"
+Page not found = "Seite nicht gefunden"
 Password = "Passwort"
 Password Again = "Passwort wiederholen"
 Password cannot be blank = "Das Passwort darf nicht leer sein"

languages/en.ini

@@ -49,6 +49,7 @@ All Pages Loaded = "All Pages Loaded"
 All Text = "All Text"
 alphabrowse_matches = "Titles"
 An error has occurred = "An error has occurred"
+An error occurred during execution; please try again later. = "An error occurred during execution; please try again later."
 AND = AND
 anonymous_tags = "Anonymous Tags"
 APA Citation = "APA Citation"
@@ -124,8 +125,8 @@ bulk_fail = "Sorry, an error has occurred. Please try again."
 bulk_noitems_advice = "No items were selected. Please click on a checkbox next to an item and try again."
 bulk_save_error = "Some data was missing. Your items were not saved."
 bulk_save_success = "Your item(s) were saved successfully"
-By = By
 by = by
+By = By
 By Alphabetical = "By Alphabetical"
 By Author = "By Author"
 By Call Number = "By Call Number"
@@ -635,6 +636,7 @@ Other Authors = "Other Authors"
 Other Editions = "Other Editions"
 Other Libraries = "Other Libraries"
 Other Sources = "Other Sources"
+Page not found = "Page not found"
 Password = Password
 Password Again = "Password Again"
 Password cannot be blank = "Password cannot be blank"
@@ -983,4 +985,4 @@ Your Profile = "Your Profile"
 Your search terms = "Your search terms"
 Your Tags = "Your Tags"
 Zip = Zip
-zoom = "Zoom"
+zoom = "Zoom"
\ No newline at end of file