[open-ils-commits] [GIT] Evergreen ILS branch master updated. ed4c017b6b950a16ba09fa7bef5f8fd8a1eb4178

[Evergreen Git]

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  ed4c017b6b950a16ba09fa7bef5f8fd8a1eb4178 (commit)
      from  bac7117652853b4957b0e52eff49aabfa7660621 (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 ed4c017b6b950a16ba09fa7bef5f8fd8a1eb4178
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu May 19 12:56:57 2011 -0400

    The term "foreign" has undesirable implied meaning, so we will dub these "conjoined"
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 38ae9a1..a24b594 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -287,9 +287,9 @@
 <!ENTITY staff.cat.opac.manage_parts.accesskey "P">
 <!ENTITY staff.cat.opac.manage_parts.label "Manage Parts">
 <!ENTITY staff.cat.opac.manage_multi_home_items.accesskey "F">
-<!ENTITY staff.cat.opac.manage_multi_home_items.label "Manage Foreign Items">
+<!ENTITY staff.cat.opac.manage_multi_home_items.label "Manage Conjoined Items">
 <!ENTITY staff.cat.opac.mark_for_multi_home.accesskey "F">
-<!ENTITY staff.cat.opac.mark_for_multi_home.label "Mark as Target for Foreign Items">
+<!ENTITY staff.cat.opac.mark_for_multi_home.label "Mark as Target for Conjoined Items">
 <!ENTITY staff.cat.opac.marc_edit.accesskey "E">
 <!ENTITY staff.cat.opac.marc_edit.label "MARC Edit">
 <!ENTITY staff.cat.opac.marc_view.accesskey "V">
@@ -2495,7 +2495,7 @@
 <!ENTITY staff.hold_list.cancel_hold_dialog.cancel_btn.accesskey "C">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.label "Apply">
 <!ENTITY staff.hold_list.cancel_hold_dialog.apply_btn.accesskey "A">
-<!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Foreign Items">
+<!ENTITY staff.cat.manage_multi_bib_items.caption "Manage Conjoined Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.label "Actions for Selected Items">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu.accesskey "f">
 <!ENTITY staff.cat.manage_multi_bib_items.actions.menu_entry.show_in_opac.label "Show in Catalog">
@@ -2526,7 +2526,7 @@
 <!ENTITY staff.cat.copy_browser.actions.cmd_edit_items.accesskey "E">
 <!ENTITY staff.cat.copy_browser.actions.cmd_transfer_items.label "Transfer Items to Previously Marked Volume">
 <!ENTITY staff.cat.copy_browser.actions.cmd_transfer_items.accesskey "T">
-<!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.label "Link as Foreign Items to Previously Marked Bib Record">
+<!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.label "Link as Conjoined Items to Previously Marked Bib Record">
 <!ENTITY staff.cat.copy_browser.actions.cmd_link_as_multi_bib.accesskey "F">
 <!ENTITY staff.cat.copy_browser.actions.cmd_add_volumes.label "Add Volumes">
 <!ENTITY staff.cat.copy_browser.actions.cmd_add_volumes.accesskey "V">
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
index 51e080f..0a4a109 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
@@ -10,7 +10,7 @@ staff.cat.bib_brief.inactive=(Inactive)
 staff.cat.bib_brief.noncat=(Not Cataloged)
 staff.cat.bib_brief.noncat.alert=Item not cataloged.
 # %1$s = Bib Record ID
-staff.cat.manage_multi_bib_items.tab_name=Manage Foreign Items for Bib %1$s
+staff.cat.manage_multi_bib_items.tab_name=Manage Conjoined Items for Bib %1$s
 staff.cat.manage_multi_bib_items.result.column.value.error=Error
 staff.cat.manage_multi_bib_items.result.column.value.success=Success
 staff.cat.manage_multi_bib_items.result.column.value.failed=Failed
@@ -77,7 +77,7 @@ staff.cat.copy_browser.transfer.success=Volumes transferred.
 staff.cat.copy_browser.transfer.unexpected_error=All volumes not likely transferred.
 staff.cat.copy_browser.transfer_items.missing_volume=Please mark a volume as the destination from within holdings maintenance and then try this again.
 staff.cat.copy_browser.transfer_items.unexpected_error=All copies not likely transferred.
-staff.cat.copy_browser.link_as_multi_bib.missing_bib=Please Mark a bib record as a Target for Foreign Items and try this again.
+staff.cat.copy_browser.link_as_multi_bib.missing_bib=Please Mark a bib record as a Target for Conjoined Items and try this again.
 staff.cat.copy_browser.missing_library=Missing library list.
 staff.cat.copy_browser.consortial_copy_count.error=Error retrieving consortial copy count.
 staff.cat.copy_browser.list_init.tree_location=Location/Barcode

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    8 ++++----
 .../server/locale/en-US/cat.properties             |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS