[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4f3f43e42c58a279d08a25280de9a2e406e2df53
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 27 01:13:49 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 4f3f43e42c58a279d08a25280de9a2e406e2df53 (commit)
from b844a3c1fbda7fc66193e5c3f400ba0b3e35d7de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4f3f43e42c58a279d08a25280de9a2e406e2df53
Author: Elliot Voris <elliotfriend at gmail.com>
Date: Thu Mar 6 20:55:56 2014 -0600
LP#1233757 Correct Spelling Error in Checkout Override Exception
Correcting a few misspellings of "overridden" in the staff client
override exception.
Signed-off-by: Elliot Voris <evoris at slcconline.edu>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index e84ee95..2a7578e 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -802,7 +802,7 @@ cat.util.batch_edit_volumes = function(fleshed_volumes) {
if (!r) { throw('Update method returned null or false.'); }
if (typeof r.ilsevent != 'undefined') {
if (r.ilsevent == 1705 /* VOLUME_LABEL_EXISTS */) {
- /* not overriden, but otherwise handled, so ignore */
+ /* not overridden, but otherwise handled, so ignore */
return false;
} else {
throw(r);
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 9efba23..6a2aea1 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -48,7 +48,7 @@ staff.circ.checkout.barcode.failed.alert=Check Out Failed %1$s
staff.circ.checkout.override.confirm=Override Checkout Failure?
staff.circ.checkout.override.item_deposit_required.warning=A billing for an Item Deposit will be added to the patron's account if this action is overrided.
staff.circ.checkout.override.item_rental_fee_required.warning=A billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
-staff.circ.checkout.override.will_auto=If overriden now, subsequent checkouts during this patron's session will auto-override this event.
+staff.circ.checkout.override.will_auto=If overridden now, subsequent checkouts during this patron's session will auto-override this event.
staff.circ.checkout.error_retrieving_copy_status=Could not retrieve the name of the current status for the copy
staff.circ.checkout.not_cataloged.confirm=Barcode %1$s was either mis-scanned or is a non-cataloged item. Checkout as a pre-cataloged item?
staff.circ.pre_cataloged=Pre-cataloged
diff --git a/build/i18n/po/circ.properties/circ.properties.pot b/build/i18n/po/circ.properties/circ.properties.pot
index 69a740d..65f1c9b 100644
--- a/build/i18n/po/circ.properties/circ.properties.pot
+++ b/build/i18n/po/circ.properties/circ.properties.pot
@@ -232,7 +232,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/cs-CZ.po b/build/i18n/po/circ.properties/cs-CZ.po
index 6c637a4..47eb6b8 100644
--- a/build/i18n/po/circ.properties/cs-CZ.po
+++ b/build/i18n/po/circ.properties/cs-CZ.po
@@ -242,7 +242,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
"Pokud budete nyní pokračovat, následující výpůjčky během této čtenářovy "
diff --git a/build/i18n/po/circ.properties/de-DE.po b/build/i18n/po/circ.properties/de-DE.po
index 4f1d506..9a0d605 100644
--- a/build/i18n/po/circ.properties/de-DE.po
+++ b/build/i18n/po/circ.properties/de-DE.po
@@ -236,7 +236,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/en-CA.po b/build/i18n/po/circ.properties/en-CA.po
index 839ee6d..c7058fe 100644
--- a/build/i18n/po/circ.properties/en-CA.po
+++ b/build/i18n/po/circ.properties/en-CA.po
@@ -242,10 +242,10 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
#: staff.circ.checkout.error_retrieving_copy_status
diff --git a/build/i18n/po/circ.properties/en-GB.po b/build/i18n/po/circ.properties/en-GB.po
index e6c072e..1ca94d0 100644
--- a/build/i18n/po/circ.properties/en-GB.po
+++ b/build/i18n/po/circ.properties/en-GB.po
@@ -242,10 +242,10 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
#: staff.circ.checkout.error_retrieving_copy_status
diff --git a/build/i18n/po/circ.properties/es-ES.po b/build/i18n/po/circ.properties/es-ES.po
index 4202f2e..e0664c3 100644
--- a/build/i18n/po/circ.properties/es-ES.po
+++ b/build/i18n/po/circ.properties/es-ES.po
@@ -238,7 +238,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/fi-FI.po b/build/i18n/po/circ.properties/fi-FI.po
index c922c4b..61086b9 100644
--- a/build/i18n/po/circ.properties/fi-FI.po
+++ b/build/i18n/po/circ.properties/fi-FI.po
@@ -241,7 +241,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
"Jos toiminto ohitetaan nyt, asiakkaan istunnon aikana tehdyt myöhemmät "
diff --git a/build/i18n/po/circ.properties/fr-CA.po b/build/i18n/po/circ.properties/fr-CA.po
index de5fd77..9bfaca6 100644
--- a/build/i18n/po/circ.properties/fr-CA.po
+++ b/build/i18n/po/circ.properties/fr-CA.po
@@ -246,7 +246,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/hy-AM.po b/build/i18n/po/circ.properties/hy-AM.po
index 5068c0d..3a100f3 100644
--- a/build/i18n/po/circ.properties/hy-AM.po
+++ b/build/i18n/po/circ.properties/hy-AM.po
@@ -239,7 +239,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
"Եթե հիմա վերաբաշխված է, այս հաճախորդի կապի ընթացքում հաջորդող դուրս "
diff --git a/build/i18n/po/circ.properties/oc-FR.po b/build/i18n/po/circ.properties/oc-FR.po
index e4f85a5..b3f5822 100644
--- a/build/i18n/po/circ.properties/oc-FR.po
+++ b/build/i18n/po/circ.properties/oc-FR.po
@@ -236,7 +236,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/pt-BR.po b/build/i18n/po/circ.properties/pt-BR.po
index fb90dc9..94a18ba 100644
--- a/build/i18n/po/circ.properties/pt-BR.po
+++ b/build/i18n/po/circ.properties/pt-BR.po
@@ -245,7 +245,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
"Se sobreposto agora, empréstimos subsequentes durante esta sessão de "
diff --git a/build/i18n/po/circ.properties/ru-RU.po b/build/i18n/po/circ.properties/ru-RU.po
index d242d5c..d09f962 100644
--- a/build/i18n/po/circ.properties/ru-RU.po
+++ b/build/i18n/po/circ.properties/ru-RU.po
@@ -238,7 +238,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
diff --git a/build/i18n/po/circ.properties/tr-TR.po b/build/i18n/po/circ.properties/tr-TR.po
index 3d1e8ec..c65869d 100644
--- a/build/i18n/po/circ.properties/tr-TR.po
+++ b/build/i18n/po/circ.properties/tr-TR.po
@@ -236,7 +236,7 @@ msgstr ""
#: staff.circ.checkout.override.will_auto
msgid ""
-"If overriden now, subsequent checkouts during this patron's session will "
+"If overridden now, subsequent checkouts during this patron's session will "
"auto-override this event."
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/xul/staff_client/server/cat/util.js | 2 +-
.../server/locale/en-US/circ.properties | 2 +-
build/i18n/po/circ.properties/circ.properties.pot | 2 +-
build/i18n/po/circ.properties/cs-CZ.po | 2 +-
build/i18n/po/circ.properties/de-DE.po | 2 +-
build/i18n/po/circ.properties/en-CA.po | 4 ++--
build/i18n/po/circ.properties/en-GB.po | 4 ++--
build/i18n/po/circ.properties/es-ES.po | 2 +-
build/i18n/po/circ.properties/fi-FI.po | 2 +-
build/i18n/po/circ.properties/fr-CA.po | 2 +-
build/i18n/po/circ.properties/hy-AM.po | 2 +-
build/i18n/po/circ.properties/oc-FR.po | 2 +-
build/i18n/po/circ.properties/pt-BR.po | 2 +-
build/i18n/po/circ.properties/ru-RU.po | 2 +-
build/i18n/po/circ.properties/tr-TR.po | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list