Backport r11382, r11383 from trunk to fix some entity problems for reports interface

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11497 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/reports.dtd b/Open-ILS/web/opac/locale/en-US/reports.dtd
index 2a2993e..72bd39e 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/reports.dtd
+++ b/Open-ILS/web/opac/locale/en-US/reports.dtd
@@ -44,6 +44,7 @@
 <!ENTITY reports.oils_rpt_builder.display_items "Display Items">
 <!ENTITY reports.oils_rpt_builder.filters "Filters">
 <!ENTITY reports.oils_rpt_builder.aggregate_filters "Aggregate Filters">
+<!ENTITY reports.oils_rpt_builder.create_aggregate_filter "Create Aggregate Filter">
 <!ENTITY reports.oils_rpt_builder.field_editor_window.label "Select how this field should be displayed:">
 <!ENTITY reports.oils_rpt_builder.add_item "Add Item">
 <!ENTITY reports.oils_rpt_builder.select_filter_to_apply "Select what filter should be applied to this field:">
@@ -51,9 +52,6 @@
 <!ENTITY reports.oils_rpt_builder.choose_a_filter "Choose a Filter: ">
 <!ENTITY reports.oils_rpt_builder.create_filter "Create Filter">
 <!ENTITY reports.oils_rpt_builder.aggregate_filter_to_apply "Select what aggregate filter should be applied to this field:">
-<!ENTITY reports.oils_rpt_builder.choose_a_transform "Choose a Transform: ">
-<!ENTITY reports.oils_rpt_builder.choose_a_filter "Choose a Filter: ">
-<!ENTITY reports.oils_rpt_builder.create_aggregate_filter "Create Aggregate Filter">
 <!ENTITY reports.oils_rpt_builder.selected_to_sort_columns "Select how the columns should be sorted">
 <!ENTITY reports.oils_rpt_builder.choose_column "Choose a column: ">
 <!ENTITY reports.oils_rpt_builder.choose_sorting_direction "Choose the direction the sorting should occur: ">
@@ -200,7 +198,6 @@
 <!ENTITY reports.xul.template_builder.display_name.label "Display Name">
 <!ENTITY reports.xul.template_builder.field_transform_type.label "Field Transform Type">
 <!ENTITY reports.xul.template_builder.alter_display_header.label "Alter Display Header">
-<!ENTITY reports.xul.template_builder.change_transform.label "Change Transform">
 <!ENTITY reports.xul.template_builder.move_up.label "Move Up">
 <!ENTITY reports.xul.template_builder.move_down.label "Move Down">
 <!ENTITY reports.xul.template_builder.remove_selected_field.label "Remove Selected Field">
@@ -212,7 +209,6 @@
 <!ENTITY reports.xul.template_builder.change_value.label "Change value">
 <!ENTITY reports.xul.template_builder.remove_value.label "Remove value">
 <!ENTITY reports.xul.template_builder.remove_selected_fields.label "Remove Selected Fields">
-<!ENTITY reports.xul.template_builder.source_specifier.label "Source Specifier">
 <!ENTITY reports.xul.template_builder.table_name.label "Table Name">
 <!ENTITY reports.xul.template_builder.sql_alias.label "SQL Alias">
 <!ENTITY reports.xul.template_builder.relationship.label "Relationship">