From c679b4d14a1be14b71e8d1bc0e54e81a2e8cf93b Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 25 Jan 2011 03:13:38 +0000
Subject: [PATCH] Fix existing serial entities that didn't provide .label
 partners for .accesskey

The translate-toolkit project generates a POT file from an input DTD
that requires entities ending in .accesskey to have a corresponding
.label entity; this is a Mozilla convention for localization. Fix up
the serial interface strings that are localized to match this expectation.

Also remove two duplicate entities in lang.dtd that were flagged by
the build/i18n/tests/check_entities.py script (and which cause Launchpad
translation imports to break).


git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@19278 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/lang.dtd            |  58 +++--
 .../server/serial/batch_receive_overlay.xul        |  12 +-
 .../staff_client/server/serial/sbsum_editor.xul    |   2 +-
 .../xul/staff_client/server/serial/scap_editor.xul |   4 +-
 .../staff_client/server/serial/sdist2_editor.xul   |   4 +-
 .../staff_client/server/serial/sdist_editor.xul    |   4 +-
 .../staff_client/server/serial/sisum_editor.xul    |   2 +-
 .../staff_client/server/serial/sitem_editor.xul    |   4 +-
 .../staff_client/server/serial/sssum_editor.xul    |   2 +-
 .../xul/staff_client/server/serial/sstr_editor.xul |   2 +-
 .../xul/staff_client/server/serial/ssub_editor.xul |   4 +-
 build/i18n/po/lang.dtd/lang.dtd.pot                | 239 +++++----------------
 12 files changed, 107 insertions(+), 230 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 6a31612d85..7456d0ef25 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1576,64 +1576,63 @@
 <!ENTITY staff.serial.mfhd_menu.add.label "Add MFHD Record">
 <!ENTITY staff.serial.mfhd_menu.edit.label "Edit MFHD Record">
 <!ENTITY staff.serial.mfhd_menu.delete.label "Delete MFHD Record">
-<!ENTITY staff.serial.scap_editor.pattern_wizard "Pattern Code Wizard">
+<!ENTITY staff.serial.scap_editor.pattern_wizard.label "Pattern Code Wizard">
 <!ENTITY staff.serial.scap_editor.pattern_wizard.accesskey "Z">
+<!ENTITY staff.serial.scap_editor.modify.label "Modify Caption and Pattern(s)">
 <!ENTITY staff.serial.scap_editor.modify.accesskey "M">
-<!ENTITY staff.serial.scap_editor.modify "Modify Caption and Pattern(s)">
-<!ENTITY staff.serial.scap_editor.modify.accesskey "M">
-<!ENTITY staff.serial.scap_editor.create "Create Caption and Pattern(s)">
+<!ENTITY staff.serial.scap_editor.create.label "Create Caption and Pattern(s)">
 <!ENTITY staff.serial.scap_editor.create.accesskey "C">
-<!ENTITY staff.serial.scap_editor.notes "Caption and Pattern Notes">
+<!ENTITY staff.serial.scap_editor.notes.label "Caption and Pattern Notes">
 <!ENTITY staff.serial.scap_editor.notes.accesskey "N">
-<!ENTITY staff.serial.sbsum_editor.modify "Modify Basic Summary">
+<!ENTITY staff.serial.sbsum_editor.modify.label "Modify Basic Summary">
 <!ENTITY staff.serial.sbsum_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sisum_editor.modify "Modify Index Summary">
+<!ENTITY staff.serial.sisum_editor.modify.label "Modify Index Summary">
 <!ENTITY staff.serial.sisum_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sssum_editor.modify "Modify Supplement Summary">
+<!ENTITY staff.serial.sssum_editor.modify.label "Modify Supplement Summary">
 <!ENTITY staff.serial.sssum_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sdist_editor.modify "Modify Distribution(s)">
+<!ENTITY staff.serial.sdist_editor.modify.label "Modify Distribution(s)">
 <!ENTITY staff.serial.sdist_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sdist_editor.create "Create Distribution(s)">
+<!ENTITY staff.serial.sdist_editor.create.label "Create Distribution(s)">
 <!ENTITY staff.serial.sdist_editor.create.accesskey "C">
-<!ENTITY staff.serial.sdist_editor.notes "Distribution Notes">
+<!ENTITY staff.serial.sdist_editor.notes.label "Distribution Notes">
 <!ENTITY staff.serial.sdist_editor.notes.accesskey "N">
 <!ENTITY staff.serial.serctrl_view.label "Serial Control View">
-<!ENTITY staff.serial.siss_editor.modify "Modify Issuance(s)">
+<!ENTITY staff.serial.siss_editor.modify.label "Modify Issuance(s)">
 <!ENTITY staff.serial.siss_editor.modify.accesskey "M">
-<!ENTITY staff.serial.siss_editor.create "Create Issuance(s)">
+<!ENTITY staff.serial.siss_editor.create.label "Create Issuance(s)">
 <!ENTITY staff.serial.siss_editor.create.accesskey "C">
-<!ENTITY staff.serial.siss_editor.notes "Issuance Notes">
+<!ENTITY staff.serial.siss_editor.notes.label "Issuance Notes">
 <!ENTITY staff.serial.siss_editor.notes.accesskey "N">
-<!ENTITY staff.serial.sitem_editor.modify "Modify Item(s)">
+<!ENTITY staff.serial.sitem_editor.modify.label "Modify Item(s)">
 <!ENTITY staff.serial.sitem_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sitem_editor.create "Create Item(s)">
+<!ENTITY staff.serial.sitem_editor.create.label "Create Item(s)">
 <!ENTITY staff.serial.sitem_editor.create.accesskey "C">
-<!ENTITY staff.serial.sitem_editor.notes "Item Notes">
+<!ENTITY staff.serial.sitem_editor.notes.label "Item Notes">
 <!ENTITY staff.serial.sitem_editor.notes.accesskey "N">
-<!ENTITY staff.serial.sstr_editor.modify "Modify Stream(s)">
+<!ENTITY staff.serial.sstr_editor.modify.label "Modify Stream(s)">
 <!ENTITY staff.serial.sstr_editor.modify.accesskey "M">
-<!ENTITY staff.serial.sstr_editor.create "Create Stream(s)">
+<!ENTITY staff.serial.sstr_editor.create.label "Create Stream(s)">
 <!ENTITY staff.serial.sstr_editor.create.accesskey "C">
-<!ENTITY staff.serial.ssub_editor.modify "Modify Subscription(s)">
+<!ENTITY staff.serial.ssub_editor.modify.label "Modify Subscription(s)">
 <!ENTITY staff.serial.ssub_editor.modify.accesskey "M">
-<!ENTITY staff.serial.ssub_editor.create "Create Subscription(s)">
+<!ENTITY staff.serial.ssub_editor.create.label "Create Subscription(s)">
 <!ENTITY staff.serial.ssub_editor.create.accesskey "C">
-<!ENTITY staff.serial.ssub_editor.notes "Subscription Notes">
+<!ENTITY staff.serial.ssub_editor.notes.label "Subscription Notes">
 <!ENTITY staff.serial.ssub_editor.notes.accesskey "N">
 
 <!ENTITY staff.serial.batch_receive "Batch Receive">
-<!ENTITY staff.serial.batch_receive.bib_search_term "Enter an identifier for a bibliographic record:">
+<!ENTITY staff.serial.batch_receive.bib_search_term.label "Enter an identifier for a bibliographic record:">
 <!ENTITY staff.serial.batch_receive.bib_search_term.accesskey "B">
-<!ENTITY staff.serial.batch_receive.find_record "Find Record">
+<!ENTITY staff.serial.batch_receive.find_record.label "Find Record">
 <!ENTITY staff.serial.batch_receive.find_record.accesskey "F">
 <!ENTITY staff.serial.batch_receive.title "Title:">
 <!ENTITY staff.serial.batch_receive.author "Author:">
 <!ENTITY staff.serial.batch_receive.fulfilling_sub "Fulfilling Subscription:">
-<!ENTITY staff.serial.batch_receive.choose_sub "Choose a Subscription:">
+<!ENTITY staff.serial.batch_receive.choose_sub.label "Choose a Subscription:">
 <!ENTITY staff.serial.batch_receive.choose_sub.accesskey "S">
-<!ENTITY staff.serial.batch_receive.choose_issuance "Choose an Issuance:">
+<!ENTITY staff.serial.batch_receive.choose_issuance.label "Choose an Issuance:">
 <!ENTITY staff.serial.batch_receive.choose_issuance.accesskey "I">
-<!ENTITY staff.serial.batch_receive.next "Next">
+<!ENTITY staff.serial.batch_receive.next.label "Next">
 <!ENTITY staff.serial.batch_receive.next.accesskey "N">
 <!ENTITY staff.serial.batch_receive.issuance "Issuance:">
 <!ENTITY staff.serial.batch_receive.no_items "There are no items to receive for this subscription.">
@@ -1647,9 +1646,9 @@
 <!ENTITY staff.serial.batch_receive.receive "Receive?">
 <!ENTITY staff.serial.batch_receive.auto_generate "Auto-generate?">
 <!ENTITY staff.serial.batch_receive.recieve_selected "Receive Selected Items">
-<!ENTITY staff.serial.batch_receive.start_over "Start Over">
+<!ENTITY staff.serial.batch_receive.start_over.label "Start Over">
 <!ENTITY staff.serial.batch_receive.start_over.accesskey "O">
-<!ENTITY staff.serial.batch_receive.with_units "Create Units For Received Items">
+<!ENTITY staff.serial.batch_receive.with_units.label "Create Units For Received Items">
 <!ENTITY staff.serial.batch_receive.with_units.accesskey "U">
 
 <!ENTITY staff.survey.wizard.page1 "Initial Settings">
@@ -1843,7 +1842,6 @@
 <!ENTITY staff.server.admin.copy_locations.editor.help "Help">
 <!ENTITY staff.server.admin.copy_locations.editor.opac_visible "OPAC Visible">
 <!ENTITY staff.server.admin.copy_locations.editor.circulate "Circulate">
-<!ENTITY staff.server.admin.copy_locations.editor.create "Create">
 <!ENTITY staff.server.admin.copy_locations.editor.edit "Edit">
 <!ENTITY staff.server.admin.copy_locations.editor.delete "Delete">
 <!ENTITY staff.server.admin.copy_locations.editor.help.holdable "If a copy location is 'Holdable', copies in that location may have holds placed on them.">
diff --git a/Open-ILS/xul/staff_client/server/serial/batch_receive_overlay.xul b/Open-ILS/xul/staff_client/server/serial/batch_receive_overlay.xul
index adedc30bf7..e29100dd86 100644
--- a/Open-ILS/xul/staff_client/server/serial/batch_receive_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/serial/batch_receive_overlay.xul
@@ -18,12 +18,12 @@
                     <label
                         control="bib_search_term"
                         accesskey="&staff.serial.batch_receive.bib_search_term.accesskey;"
-                        value="&staff.serial.batch_receive.bib_search_term;" />
+                        value="&staff.serial.batch_receive.bib_search_term.label;" />
                     <textbox id="bib_search_term"
                         onkeypress="batch_receiver.bib_lookup(null, event);" />
                     <button id="bib_lookup_submit"
                         oncommand="batch_receiver.bib_lookup();"
-                        label="&staff.serial.batch_receive.find_record;"
+                        label="&staff.serial.batch_receive.find_record.label;"
                         accesskey="&staff.serial.batch_receive.find_record.accesskey;" />
                 </hbox>
             </vbox>
@@ -53,7 +53,7 @@
                     <box id="sub_chooser_here"></box>
                     <button
                         oncommand="batch_receiver.choose_issuance();"
-                        label="&staff.serial.batch_receive.next;"
+                        label="&staff.serial.batch_receive.next.label;"
                         accesskey="&staff.serial.batch_receive.next.accesskey;" />
                 </hbox>
             </vbox>
@@ -72,7 +72,7 @@
                     <box id="issuance_chooser_here"></box>
                     <button
                         oncommand="batch_receiver.load_entry_form();"
-                        label="&staff.serial.batch_receive.next;"
+                        label="&staff.serial.batch_receive.next.label;"
                         accesskey="&staff.serial.batch_receive.next.accesskey;" />
                 </hbox>
             </vbox>
@@ -158,14 +158,14 @@
 
         <hbox align="center">
             <button oncommand="batch_receiver.init();"
-                label="&staff.serial.batch_receive.start_over;"
+                label="&staff.serial.batch_receive.start_over.label;"
                 accesskey="&staff.serial.batch_receive.start_over.accesskey;" />
             <spacer flex="1" />
             <checkbox
                 id="batch_receive_with_units"
                 oils_persist="checked"
                 oncommand="batch_receiver.toggle_receive_with_units(event);"
-                label="&staff.serial.batch_receive.with_units;"
+                label="&staff.serial.batch_receive.with_units.label;"
                 accesskey="&staff.serial.batch_receive.with_units.accesskey;" />
         </hbox>
     </box>
diff --git a/Open-ILS/xul/staff_client/server/serial/sbsum_editor.xul b/Open-ILS/xul/staff_client/server/serial/sbsum_editor.xul
index 9880c5dac0..46e881c47d 100644
--- a/Open-ILS/xul/staff_client/server/serial/sbsum_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sbsum_editor.xul
@@ -22,7 +22,7 @@
 
 		<hbox id="sbsum_editor_nav">
 			<spacer flex="1"/>
-			<button id="sbsum_save" label="&staff.serial.sbsum_editor.modify;" hidden="true" accesskey="&staff.serial.sbsum_editor.modify.accesskey;" oncommand="g.manage_dists.sbsum_editor.save()" />
+			<button id="sbsum_save" label="&staff.serial.sbsum_editor.modify.label;" hidden="true" accesskey="&staff.serial.sbsum_editor.modify.accesskey;" oncommand="g.manage_dists.sbsum_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/scap_editor.xul b/Open-ILS/xul/staff_client/server/serial/scap_editor.xul
index 2dd4b28fb0..c1bd89b77c 100644
--- a/Open-ILS/xul/staff_client/server/serial/scap_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/scap_editor.xul
@@ -22,8 +22,8 @@
 
 		<hbox id="scap_editor_nav">
 			<spacer flex="1"/>
-			<button id="scap_pattern_wizard" label="&staff.serial.scap_editor.pattern_wizard;" accesskey="&staff.serial.scap_editor.pattern_wizard.accesskey;" oncommand="g.manage_subs.scap_editor.pattern_wizard();" />
-			<button id="scap_save" label="&staff.serial.scap_editor.modify;" hidden="true" accesskey="&staff.serial.scap_editor.modify.accesskey;" oncommand="g.manage_subs.scap_editor.save()" />
+			<button id="scap_pattern_wizard" label="&staff.serial.scap_editor.pattern_wizard.label;" accesskey="&staff.serial.scap_editor.pattern_wizard.accesskey;" oncommand="g.manage_subs.scap_editor.pattern_wizard();" />
+			<button id="scap_save" label="&staff.serial.scap_editor.modify.label;" hidden="true" accesskey="&staff.serial.scap_editor.modify.accesskey;" oncommand="g.manage_subs.scap_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul b/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
index 63672ad543..8178da2053 100644
--- a/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
@@ -32,8 +32,8 @@
 
 		<hbox id="sdist2_editor_nav">
 			<spacer flex="1"/>
-			<button id="sdist2_notes" label="&staff.serial.sdist_editor.notes;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_dists.sdist_editor.notes()" />
-			<button id="sdist2_save" label="&staff.serial.sdist_editor.modify;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_dists.sdist_editor.save()" />
+			<button id="sdist2_notes" label="&staff.serial.sdist_editor.notes.label;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_dists.sdist_editor.notes()" />
+			<button id="sdist2_save" label="&staff.serial.sdist_editor.modify.label;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_dists.sdist_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sdist_editor.xul b/Open-ILS/xul/staff_client/server/serial/sdist_editor.xul
index 189442b703..a7db7f568b 100644
--- a/Open-ILS/xul/staff_client/server/serial/sdist_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sdist_editor.xul
@@ -31,8 +31,8 @@
 
 		<hbox id="sdist_editor_nav">
 			<spacer flex="1"/>
-			<button id="sdist_notes" label="&staff.serial.sdist_editor.notes;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_subs.sdist_editor.notes()" />
-			<button id="sdist_save" label="&staff.serial.sdist_editor.modify;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_subs.sdist_editor.save()" />
+			<button id="sdist_notes" label="&staff.serial.sdist_editor.notes.label;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_subs.sdist_editor.notes()" />
+			<button id="sdist_save" label="&staff.serial.sdist_editor.modify.label;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_subs.sdist_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sisum_editor.xul b/Open-ILS/xul/staff_client/server/serial/sisum_editor.xul
index b34bd1b790..49677901c5 100644
--- a/Open-ILS/xul/staff_client/server/serial/sisum_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sisum_editor.xul
@@ -22,7 +22,7 @@
 
 		<hbox id="sisum_editor_nav">
 			<spacer flex="1"/>
-			<button id="sisum_save" label="&staff.serial.sisum_editor.modify;" hidden="true" accesskey="&staff.serial.sisum_editor.modify.accesskey;" oncommand="g.manage_dists.sisum_editor.save()" />
+			<button id="sisum_save" label="&staff.serial.sisum_editor.modify.label;" hidden="true" accesskey="&staff.serial.sisum_editor.modify.accesskey;" oncommand="g.manage_dists.sisum_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul b/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
index 15366f032c..aa73163814 100644
--- a/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
@@ -84,8 +84,8 @@
 
 		<hbox id="nav">
 			<spacer flex="1"/>
-			<button id="sitem_notes" label="&staff.serial.sitem_editor.notes;" accesskey="&staff.serial.sitem_editor.notes.accesskey;" oncommand="g.sitem_editor.notes();"/>
-			<button id="sitem_save" label="&staff.serial.sitem_editor.modify;" hidden="true" accesskey="&staff.serial.sitem_editor.modify.accesskey;" oncommand="g.sitem_editor.save();"/>
+			<button id="sitem_notes" label="&staff.serial.sitem_editor.notes.label;" accesskey="&staff.serial.sitem_editor.notes.accesskey;" oncommand="g.sitem_editor.notes();"/>
+			<button id="sitem_save" label="&staff.serial.sitem_editor.modify.label;" hidden="true" accesskey="&staff.serial.sitem_editor.modify.accesskey;" oncommand="g.sitem_editor.save();"/>
 			<button id="sitem_cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sssum_editor.xul b/Open-ILS/xul/staff_client/server/serial/sssum_editor.xul
index ed2aca0116..3528c34286 100644
--- a/Open-ILS/xul/staff_client/server/serial/sssum_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sssum_editor.xul
@@ -22,7 +22,7 @@
 
 		<hbox id="sssum_editor_nav">
 			<spacer flex="1"/>
-			<button id="sssum_save" label="&staff.serial.sssum_editor.modify;" hidden="true" accesskey="&staff.serial.sssum_editor.modify.accesskey;" oncommand="g.manage_dists.sssum_editor.save()" />
+			<button id="sssum_save" label="&staff.serial.sssum_editor.modify.label;" hidden="true" accesskey="&staff.serial.sssum_editor.modify.accesskey;" oncommand="g.manage_dists.sssum_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/sstr_editor.xul b/Open-ILS/xul/staff_client/server/serial/sstr_editor.xul
index 4973d6d144..60548a1e51 100644
--- a/Open-ILS/xul/staff_client/server/serial/sstr_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sstr_editor.xul
@@ -22,7 +22,7 @@
 
 		<hbox id="sstr_editor_nav">
 			<spacer flex="1"/>
-			<button id="sstr_save" label="&staff.serial.sstr_editor.modify;" hidden="true" accesskey="&staff.serial.sstr_editor.modify.accesskey;" oncommand="g.manage_dists.sstr_editor.save()" />
+			<button id="sstr_save" label="&staff.serial.sstr_editor.modify.label;" hidden="true" accesskey="&staff.serial.sstr_editor.modify.accesskey;" oncommand="g.manage_dists.sstr_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/ssub_editor.xul b/Open-ILS/xul/staff_client/server/serial/ssub_editor.xul
index 46464286d3..10fabbcfb1 100644
--- a/Open-ILS/xul/staff_client/server/serial/ssub_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/ssub_editor.xul
@@ -27,8 +27,8 @@
 
 		<hbox id="nav">
 			<spacer flex="1"/>
-			<button id="ssub_notes" label="&staff.serial.ssub_editor.notes;" accesskey="&staff.serial.ssub_editor.notes.accesskey;" oncommand="g.manage_subs.ssub_editor.notes()" />
-			<button id="ssub_save" label="&staff.serial.ssub_editor.modify;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_subs.ssub_editor.save()" />
+			<button id="ssub_notes" label="&staff.serial.ssub_editor.notes.label;" accesskey="&staff.serial.ssub_editor.notes.accesskey;" oncommand="g.manage_subs.ssub_editor.notes()" />
+			<button id="ssub_save" label="&staff.serial.ssub_editor.modify.label;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_subs.ssub_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/build/i18n/po/lang.dtd/lang.dtd.pot b/build/i18n/po/lang.dtd/lang.dtd.pot
index 329c2c8a48..50dd6d887a 100644
--- a/build/i18n/po/lang.dtd/lang.dtd.pot
+++ b/build/i18n/po/lang.dtd/lang.dtd.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-24 16:22-0400\n"
+"POT-Creation-Date: 2011-01-24 22:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1222,6 +1222,7 @@ msgstr ""
 
 #: staff.cat.opac.record_next.label
 #: staff.cat.opac.record_next.accesskey
+msgctxt "staff.cat.opac.record_next.label staff.cat.opac.record_next.accesskey"
 msgid "&Next"
 msgstr ""
 
@@ -5270,7 +5271,6 @@ msgid "Title"
 msgstr ""
 
 #: staff.next.range
-msgctxt "staff.next.range"
 msgid "Next"
 msgstr ""
 
@@ -6175,223 +6175,127 @@ msgstr ""
 msgid "Delete MFHD Record"
 msgstr ""
 
-#: staff.serial.scap_editor.pattern_wizard
-msgid "Pattern Code Wizard"
-msgstr ""
-
+#: staff.serial.scap_editor.pattern_wizard.label
 #: staff.serial.scap_editor.pattern_wizard.accesskey
-msgid "Z"
-msgstr ""
-
-#: staff.serial.scap_editor.modify.accesskey
-msgctxt "staff.serial.scap_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.scap_editor.modify
-msgid "Modify Caption and Pattern(s)"
+msgid "Pattern Code Wi&zard"
 msgstr ""
 
+#: staff.serial.scap_editor.modify.label
 #: staff.serial.scap_editor.modify.accesskey
-msgctxt "staff.serial.scap_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.scap_editor.create
-msgid "Create Caption and Pattern(s)"
+msgid "&Modify Caption and Pattern(s)"
 msgstr ""
 
+#: staff.serial.scap_editor.create.label
 #: staff.serial.scap_editor.create.accesskey
-msgctxt "staff.serial.scap_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.scap_editor.notes
-msgid "Caption and Pattern Notes"
+msgid "&Create Caption and Pattern(s)"
 msgstr ""
 
+#: staff.serial.scap_editor.notes.label
 #: staff.serial.scap_editor.notes.accesskey
-msgctxt "staff.serial.scap_editor.notes.accesskey"
-msgid "N"
-msgstr ""
-
-#: staff.serial.sbsum_editor.modify
-msgid "Modify Basic Summary"
+msgid "Caption and Pattern &Notes"
 msgstr ""
 
+#: staff.serial.sbsum_editor.modify.label
 #: staff.serial.sbsum_editor.modify.accesskey
-msgctxt "staff.serial.sbsum_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sisum_editor.modify
-msgid "Modify Index Summary"
+msgid "&Modify Basic Summary"
 msgstr ""
 
+#: staff.serial.sisum_editor.modify.label
 #: staff.serial.sisum_editor.modify.accesskey
-msgctxt "staff.serial.sisum_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sssum_editor.modify
-msgid "Modify Supplement Summary"
+msgid "&Modify Index Summary"
 msgstr ""
 
+#: staff.serial.sssum_editor.modify.label
 #: staff.serial.sssum_editor.modify.accesskey
-msgctxt "staff.serial.sssum_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sdist_editor.modify
-msgid "Modify Distribution(s)"
+msgid "&Modify Supplement Summary"
 msgstr ""
 
+#: staff.serial.sdist_editor.modify.label
 #: staff.serial.sdist_editor.modify.accesskey
-msgctxt "staff.serial.sdist_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sdist_editor.create
-msgid "Create Distribution(s)"
+msgid "&Modify Distribution(s)"
 msgstr ""
 
+#: staff.serial.sdist_editor.create.label
 #: staff.serial.sdist_editor.create.accesskey
-msgctxt "staff.serial.sdist_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.sdist_editor.notes
-msgid "Distribution Notes"
+msgid "&Create Distribution(s)"
 msgstr ""
 
+#: staff.serial.sdist_editor.notes.label
 #: staff.serial.sdist_editor.notes.accesskey
-msgctxt "staff.serial.sdist_editor.notes.accesskey"
-msgid "N"
+msgid "Distribution &Notes"
 msgstr ""
 
 #: staff.serial.serctrl_view.label
 msgid "Serial Control View"
 msgstr ""
 
-#: staff.serial.siss_editor.modify
-msgid "Modify Issuance(s)"
-msgstr ""
-
+#: staff.serial.siss_editor.modify.label
 #: staff.serial.siss_editor.modify.accesskey
-msgctxt "staff.serial.siss_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.siss_editor.create
-msgid "Create Issuance(s)"
+msgid "&Modify Issuance(s)"
 msgstr ""
 
+#: staff.serial.siss_editor.create.label
 #: staff.serial.siss_editor.create.accesskey
-msgctxt "staff.serial.siss_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.siss_editor.notes
-msgid "Issuance Notes"
+msgid "&Create Issuance(s)"
 msgstr ""
 
+#: staff.serial.siss_editor.notes.label
 #: staff.serial.siss_editor.notes.accesskey
-msgctxt "staff.serial.siss_editor.notes.accesskey"
-msgid "N"
-msgstr ""
-
-#: staff.serial.sitem_editor.modify
-msgid "Modify Item(s)"
+msgid "Issuance &Notes"
 msgstr ""
 
+#: staff.serial.sitem_editor.modify.label
 #: staff.serial.sitem_editor.modify.accesskey
-msgctxt "staff.serial.sitem_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sitem_editor.create
-msgid "Create Item(s)"
+msgid "&Modify Item(s)"
 msgstr ""
 
+#: staff.serial.sitem_editor.create.label
 #: staff.serial.sitem_editor.create.accesskey
-msgctxt "staff.serial.sitem_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.sitem_editor.notes
-msgid "Item Notes"
+msgid "&Create Item(s)"
 msgstr ""
 
+#: staff.serial.sitem_editor.notes.label
 #: staff.serial.sitem_editor.notes.accesskey
-msgctxt "staff.serial.sitem_editor.notes.accesskey"
-msgid "N"
-msgstr ""
-
-#: staff.serial.sstr_editor.modify
-msgid "Modify Stream(s)"
+msgid "Item &Notes"
 msgstr ""
 
+#: staff.serial.sstr_editor.modify.label
 #: staff.serial.sstr_editor.modify.accesskey
-msgctxt "staff.serial.sstr_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.sstr_editor.create
-msgid "Create Stream(s)"
+msgid "&Modify Stream(s)"
 msgstr ""
 
+#: staff.serial.sstr_editor.create.label
 #: staff.serial.sstr_editor.create.accesskey
-msgctxt "staff.serial.sstr_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.ssub_editor.modify
-msgid "Modify Subscription(s)"
+msgid "&Create Stream(s)"
 msgstr ""
 
+#: staff.serial.ssub_editor.modify.label
 #: staff.serial.ssub_editor.modify.accesskey
-msgctxt "staff.serial.ssub_editor.modify.accesskey"
-msgid "M"
-msgstr ""
-
-#: staff.serial.ssub_editor.create
-msgid "Create Subscription(s)"
+msgid "&Modify Subscription(s)"
 msgstr ""
 
+#: staff.serial.ssub_editor.create.label
 #: staff.serial.ssub_editor.create.accesskey
-msgctxt "staff.serial.ssub_editor.create.accesskey"
-msgid "C"
-msgstr ""
-
-#: staff.serial.ssub_editor.notes
-msgid "Subscription Notes"
+msgid "&Create Subscription(s)"
 msgstr ""
 
+#: staff.serial.ssub_editor.notes.label
 #: staff.serial.ssub_editor.notes.accesskey
-msgctxt "staff.serial.ssub_editor.notes.accesskey"
-msgid "N"
+msgid "Subscription &Notes"
 msgstr ""
 
 #: staff.serial.batch_receive
 msgid "Batch Receive"
 msgstr ""
 
-#: staff.serial.batch_receive.bib_search_term
-msgid "Enter an identifier for a bibliographic record:"
-msgstr ""
-
+#: staff.serial.batch_receive.bib_search_term.label
 #: staff.serial.batch_receive.bib_search_term.accesskey
-msgctxt "staff.serial.batch_receive.bib_search_term.accesskey"
-msgid "B"
-msgstr ""
-
-#: staff.serial.batch_receive.find_record
-msgid "Find Record"
+msgid "Enter an identifier for a &bibliographic record:"
 msgstr ""
 
+#: staff.serial.batch_receive.find_record.label
 #: staff.serial.batch_receive.find_record.accesskey
-msgctxt "staff.serial.batch_receive.find_record.accesskey"
-msgid "F"
+msgid "&Find Record"
 msgstr ""
 
 #: staff.serial.batch_receive.title
@@ -6408,32 +6312,20 @@ msgstr ""
 msgid "Fulfilling Subscription:"
 msgstr ""
 
-#: staff.serial.batch_receive.choose_sub
-msgid "Choose a Subscription:"
-msgstr ""
-
+#: staff.serial.batch_receive.choose_sub.label
 #: staff.serial.batch_receive.choose_sub.accesskey
-msgctxt "staff.serial.batch_receive.choose_sub.accesskey"
-msgid "S"
-msgstr ""
-
-#: staff.serial.batch_receive.choose_issuance
-msgid "Choose an Issuance:"
+msgid "Choose a &Subscription:"
 msgstr ""
 
+#: staff.serial.batch_receive.choose_issuance.label
 #: staff.serial.batch_receive.choose_issuance.accesskey
-msgctxt "staff.serial.batch_receive.choose_issuance.accesskey"
-msgid "I"
-msgstr ""
-
-#: staff.serial.batch_receive.next
-msgctxt "staff.serial.batch_receive.next"
-msgid "Next"
+msgid "Choose an &Issuance:"
 msgstr ""
 
+#: staff.serial.batch_receive.next.label
 #: staff.serial.batch_receive.next.accesskey
-msgctxt "staff.serial.batch_receive.next.accesskey"
-msgid "N"
+msgctxt "staff.serial.batch_receive.next.label staff.serial.batch_receive.next.accesskey"
+msgid "&Next"
 msgstr ""
 
 #: staff.serial.batch_receive.issuance
@@ -6490,22 +6382,14 @@ msgstr ""
 msgid "Receive Selected Items"
 msgstr ""
 
-#: staff.serial.batch_receive.start_over
-msgid "Start Over"
-msgstr ""
-
+#: staff.serial.batch_receive.start_over.label
 #: staff.serial.batch_receive.start_over.accesskey
-msgctxt "staff.serial.batch_receive.start_over.accesskey"
-msgid "O"
-msgstr ""
-
-#: staff.serial.batch_receive.with_units
-msgid "Create Units For Received Items"
+msgid "Start &Over"
 msgstr ""
 
+#: staff.serial.batch_receive.with_units.label
 #: staff.serial.batch_receive.with_units.accesskey
-msgctxt "staff.serial.batch_receive.with_units.accesskey"
-msgid "U"
+msgid "Create &Units For Received Items"
 msgstr ""
 
 #: staff.survey.wizard.page1
@@ -7255,11 +7139,6 @@ msgctxt "staff.server.admin.copy_locations.editor.circulate"
 msgid "Circulate"
 msgstr ""
 
-#: staff.server.admin.copy_locations.editor.create
-msgctxt "staff.server.admin.copy_locations.editor.create"
-msgid "Create"
-msgstr ""
-
 #: staff.server.admin.copy_locations.editor.edit
 msgctxt "staff.server.admin.copy_locations.editor.edit"
 msgid "Edit"
-- 
2.11.0