merge from trunk

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge

diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
index 547ed4d,f9fcd6e..855911a
--- 1/Open-ILS/web/opac/locale/en-US/lang.dtd
--- 2/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@@ -706,9 -706,8 +706,10 @@@
  <!ENTITY staff.main.menu.admin.server_admin.conify.grp_tree.label "Permission Groups">
  <!ENTITY staff.main.menu.admin.server_admin.conify.perm_list.label "Permissions">
  <!ENTITY staff.main.menu.admin.server_admin.conify.copy_status.label "Copy Statuses">
- <!ENTITY staff.main.menu.admin.server_admin.conify.marc_code_maps.label "Coded Value Maps">
+ <!ENTITY staff.main.menu.admin.server_admin.conify.marc_record_attrs.label "MARC Record Attributes">
+ <!ENTITY staff.main.menu.admin.server_admin.conify.coded_value_maps.label "MARC Coded Value Maps">
 +<!ENTITY staff.main.menu.admin.server_admin.conify.acn_prefix.label "Call Number Prefixes">
 +<!ENTITY staff.main.menu.admin.server_admin.conify.acn_suffix.label "Call Number Suffixes">
  <!ENTITY staff.main.menu.admin.server_admin.conify.billing_type.label "Billing Types">
  <!ENTITY staff.main.menu.admin.server_admin.conify.z3950_source.label "Z39.50 Servers">
  <!ENTITY staff.main.menu.admin.server_admin.conify.circulation_modifier.label "Circulation Modifiers">

diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 00306be,0e71b6e..40a23ff
--- 1/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
--- 2/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@@ -139,9 -139,8 +139,10 @@@
      <command id="cmd_server_admin_perm_list"/>
      <command id="cmd_server_admin_copy_status"/>
      <command id="cmd_server_admin_marc_code"/>
+     <command id="cmd_server_admin_coded_value_map"/>
      <command id="cmd_server_admin_billing_type"/>
 +    <command id="cmd_server_admin_acn_prefix"/>
 +    <command id="cmd_server_admin_acn_suffix"/>
      <command id="cmd_server_admin_acq_invoice_item_type"/>
      <command id="cmd_server_admin_acq_invoice_payment_method"/>
      <command id="cmd_server_admin_acq_cancel_reason"/>
@@@ -393,9 -392,8 +394,10 @@@
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.grp_tree.label;" command="cmd_server_admin_grp_tree"/>
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.perm_list.label;" command="cmd_server_admin_perm_list"/>
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.copy_status.label;" command="cmd_server_admin_copy_status"/>
-                 <menuitem label="&staff.main.menu.admin.server_admin.conify.marc_code_maps.label;" command="cmd_server_admin_marc_code"/>
 +                <menuitem label="&staff.main.menu.admin.server_admin.conify.acn_prefix.label;" command="cmd_server_admin_acn_prefix"/>
 +                <menuitem label="&staff.main.menu.admin.server_admin.conify.acn_suffix.label;" command="cmd_server_admin_acn_suffix"/>
+                 <menuitem label="&staff.main.menu.admin.server_admin.conify.marc_record_attrs.label;" command="cmd_server_admin_marc_code"/>
+                 <menuitem label="&staff.main.menu.admin.server_admin.conify.coded_value_maps.label;" command="cmd_server_admin_coded_value_map"/>
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.billing_type.label;" command="cmd_server_admin_billing_type"/>
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.z3950_source.label;" command="cmd_server_admin_z39_source"/>
                  <menuitem label="&staff.main.menu.admin.server_admin.conify.circulation_modifier.label;" command="cmd_server_admin_circ_mod"/>