From 779c4e27c6330b7dad4f8ec85a919ae33afc70ba Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 15 Nov 2008 03:42:29 +0000
Subject: [PATCH] Merge r11204 from trunk: Merge Craig Ricciuto's i18n patch
 for reports (addresses #26)   * Some concatenated strings need refactoring
 into Dojo string substitution

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11210 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/opac/locale/en-US/reports.dtd         | 218 +++++++++++++++++++++
 Open-ILS/web/reports/oils_rpt.xhtml                |  34 ++--
 Open-ILS/web/reports/oils_rpt_builder.xhtml        |  84 ++++----
 Open-ILS/web/reports/oils_rpt_common.xhtml         |   4 +-
 Open-ILS/web/reports/oils_rpt_editor.xhtml         |  67 ++++---
 Open-ILS/web/reports/oils_rpt_folder_manager.xhtml |  46 ++---
 Open-ILS/web/reports/oils_rpt_folder_window.xhtml  |  76 +++----
 Open-ILS/web/reports/oils_rpt_param_editor.xhtml   |  20 +-
 Open-ILS/web/reports/xul/template_builder.xul      | 117 +++++------
 9 files changed, 438 insertions(+), 228 deletions(-)
 create mode 100644 Open-ILS/web/opac/locale/en-US/reports.dtd

diff --git a/Open-ILS/web/opac/locale/en-US/reports.dtd b/Open-ILS/web/opac/locale/en-US/reports.dtd
new file mode 100644
index 0000000000..8730a31d53
--- /dev/null
+++ b/Open-ILS/web/opac/locale/en-US/reports.dtd
@@ -0,0 +1,218 @@
+<!-- Common Entities -->
+<!ENTITY reports.common.logged_in_as "You are logged in as ">
+<!ENTITY reports.common.loading "Loading...">
+
+<!ENTITY reports.oils_rpt.title "Evergreen: Reports">
+<!ENTITY reports.oils_rpt.insufficient_permissions "You do not have sufficient permissions to run reports">
+<!ENTITY reports.oils_rpt.my_folders "My Folders">
+<!ENTITY reports.oils_rpt.shared_folders "Shared Folders">
+<!ENTITY reports.oils_rpt.manage_folder_contents "Manage Folder Contents">
+<!ENTITY reports.oils_rpt.manage_folder "Manage Folder">
+<!ENTITY reports.oils_rpt.created_by "created by ">
+<!ENTITY reports.oils_rpt.create_new_sub_folder "Create a new sub-folder">
+<!ENTITY reports.oils_rpt.folder_type "Folder type: ">
+<!ENTITY reports.oils_rpt.folder_name "Folder Name:">
+<!ENTITY reports.oils_rpt.share_folder "Share this folder:">
+<!ENTITY reports.oils_rpt.do_not_share "Do not share">
+<!ENTITY reports.oils_rpt.share "Share">
+<!ENTITY reports.oils_rpt.share_with "Share with:">
+<!ENTITY reports.oils_rpt.create_sub_folder "Create Sub Folder">
+
+
+<!ENTITY reports.oils_rpt_builder.title "Evergreen: Report Builder">
+<!ENTITY reports.oils_rpt_builder.reports_home "Reports Home">
+<!ENTITY reports.oils_rpt_builder.cloning_template "Cloning template">
+<!ENTITY reports.oils_rpt_builder.template_name "Template Name: ">
+<!ENTITY reports.oils_rpt_builder.template_description "Template Description: ">
+<!ENTITY reports.oils_rpt_builder.template_type "Template Type: ">
+<!ENTITY reports.oils_rpt_builder.save_this_template "Save this Template: ">
+<!ENTITY reports.oils_rpt_builder.filtering_note "Indicates that when filtering on the item, a list of named choices will be generated.">
+<!ENTITY reports.oils_rpt_builder.temp_disp_items "Template Display Items">
+<!ENTITY reports.oils_rpt_builder.remove_selected "Remove Selected">
+
+<!ENTITY reports.oils_rpt_builder.move_up "Move Up">
+<!ENTITY reports.oils_rpt_builder.move_down "Move Down">
+<!-- The below two entity strings were the contents of the .xhtml file but I don't think that works when using XML entities -->
+<!-- ENTITY reports.oils_rpt_builder.move_up "Move &uarr;" -->
+<!-- ENTITY reports.oils_rpt_builder.move_down "Move &darr;" -->
+
+<!ENTITY reports.oils_rpt_builder.template_filters "Template Filters">
+<!ENTITY reports.oils_rpt_builder.report_aggregate_filters "Report Aggregate Filters">
+<!ENTITY reports.oils_rpt_builder.hint "Hint: ">
+<!ENTITY reports.oils_rpt_builder.hint_item_details "Double-click on an item to see the item details.">
+<!ENTITY reports.oils_rpt_builder.template_types "Template Types">
+<!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.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:">
+<!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_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: ">
+<!ENTITY reports.oils_rpt_builder.ascending "Ascending">
+<!ENTITY reports.oils_rpt_builder.descending "Descending">
+<!ENTITY reports.oils_rpt_builder.add_sort "Add Sort">
+<!ENTITY reports.oils_rpt_builder.close_window "Close Window">
+<!ENTITY reports.oils_rpt_builder.confirm_new_report "This will destroy the report you are currently constructing.  Are you sure you wish to do this?">
+
+
+<!ENTITY reports.oils_rpt_common.action_succeeded "Action Succeeded">
+<!ENTITY reports.oils_rpt_common.action_failed "Action Failed">
+
+
+<!ENTITY reports.oils_rpt_editor.template_name "Template Name:">
+<!ENTITY reports.oils_rpt_editor.template_creator "Template Creator:">
+<!ENTITY reports.oils_rpt_editor.template_description "Template Description:">
+<!ENTITY reports.oils_rpt_editor.report_name "Report Name:">
+<!ENTITY reports.oils_rpt_editor.report_description "Report Description:">
+<!ENTITY reports.oils_rpt_editor.report_columns "Report Columns:">
+<!ENTITY reports.oils_rpt_editor.pivot_label_column "Pivot Label Column:">
+<!ENTITY reports.oils_rpt_editor.select_option "Select One (optional)">
+<!ENTITY reports.oils_rpt_editor.pivot_data_column "Pivot Data Column:">
+<!ENTITY reports.oils_rpt_editor.store_report_definition "Choose a folder to store this report definition: ">
+<!ENTITY reports.oils_rpt_editor.selected_folder "Selected Folder: ">
+<!ENTITY reports.oils_rpt_editor.output_options "Output Options">
+<!ENTITY reports.oils_rpt_editor.excel_output "Excel Output">
+<!ENTITY reports.oils_rpt_editor.csv_output "CSV Output">
+<!ENTITY reports.oils_rpt_editor.html_output "HTML Output">
+<!ENTITY reports.oils_rpt_editor.bar_charts "Bar Charts">
+<!ENTITY reports.oils_rpt_editor.line_charts "Line Charts">
+<!ENTITY reports.oils_rpt_editor.recurring_report "Recurring Report: ">
+<!ENTITY reports.oils_rpt_editor.recurring_interval "Recurrence Interval: ">
+<!ENTITY reports.oils_rpt_editor.days "Day(s)">
+<!ENTITY reports.oils_rpt_editor.weeks "Weeks(s)">
+<!ENTITY reports.oils_rpt_editor.months "Month(s)">
+<!ENTITY reports.oils_rpt_editor.run_asap "Run ASAP ">
+<!ENTITY reports.oils_rpt_editor.or_at "or at: ">
+<!ENTITY reports.oils_rpt_editor.at "at">
+<!ENTITY reports.oils_rpt_editor.sent_to_email "Send completion notification to this Email address:">
+<!ENTITY reports.oils_rpt_editor.midnight "Midnight">
+<!ENTITY reports.oils_rpt_editor.noon "Noon">
+<!ENTITY reports.oils_rpt_editor.storage_folder_for_output "Choose a folder to store this report's output:">
+<!ENTITY reports.oils_rpt_editor.save_report "Save Report">
+<!ENTITY reports.oils_rpt_editor.empty_parameter "One or more of the user-defined parameters has been left empty. Please fill in all fields.">
+<!ENTITY reports.oils_rpt_editor.same_name "There is already a report in this folder with the given name.">
+
+
+<!ENTITY reports.oils_rpt_folder_manager.change_folder_name "Change folder name">
+<!ENTITY reports.oils_rpt_folder_manager.delete_folder "Delete this folder">
+<!ENTITY reports.oils_rpt_folder_manager.create_new_sub_folder "Create a new sub-folder">
+<!ENTITY reports.oils_rpt_folder_manager.share_this_folder "Share this folder">
+<!ENTITY reports.oils_rpt_folder_manager.hide_folder "Hide (un-share) this folder">
+<!ENTITY reports.oils_rpt_folder_manager.disable_recurrence "Disable recurrence">
+<!ENTITY reports.oils_rpt_folder_manager.fldr_mngr_actions_submit "Go">
+<!ENTITY reports.oils_rpt_folder_manager.change_name "Enter new name:">
+<!ENTITY reports.oils_rpt_folder_manager.submit "Submit">
+<!ENTITY reports.oils_rpt_folder_manager.folder_name "Folder Name:">
+<!ENTITY reports.oils_rpt_folder_manager.do_not_share "Do not share">
+<!ENTITY reports.oils_rpt_folder_manager.share "Share">
+<!ENTITY reports.oils_rpt_folder_manager.share_with "Share with:">
+<!ENTITY reports.oils_rpt_folder_manager.create_sub_folder "Create Sub Folder">
+<!ENTITY reports.oils_rpt_folder_manager.change_name_confirm "Are you sure you wish to change this folder's name?">
+<!ENTITY reports.oils_rpt_folder_manager.delete_name_confirm "Are you sure you wish to delete this folder?">
+<!ENTITY reports.oils_rpt_folder_manager.cannot_delete "This folder may not be deleted because it is not empty.">
+<!ENTITY reports.oils_rpt_folder_manager.already_shared "This folder is already shared">
+<!ENTITY reports.oils_rpt_folder_manager.folder_not_shared "This folder is not shared">
+<!ENTITY reports.oils_rpt_folder_manager.confirm_hide_folder "Are you sure you wish to hide this folder?">
+
+
+<!ENTITY reports.oils_rpt_folder_window.new_report_from_template "Create a new report from selected template">
+<!ENTITY reports.oils_rpt_folder_window.clone_template "Clone selected template">
+<!ENTITY reports.oils_rpt_folder_window.delete_template "Delete selected template(s)">
+<!ENTITY reports.oils_rpt_folder_window.clone_report "Clone report">
+<!ENTITY reports.oils_rpt_folder_window.schedule_report "Schedule report">
+<!ENTITY reports.oils_rpt_folder_window.delete_reports "Delete selected report(s)">
+<!ENTITY reports.oils_rpt_folder_window.view_report_output "View report output">
+<!ENTITY reports.oils_rpt_folder_window.delete_output "Delete selected output(s)">
+<!ENTITY reports.oils_rpt_folder_window.move_templates "Move the selected template(s) to a different folder">
+<!ENTITY reports.oils_rpt_folder_window.move_reports "Move the selected report(s) to a different folder">
+<!ENTITY reports.oils_rpt_folder_window.move_output "Move the selected output(s) to a different folder">
+<!ENTITY reports.oils_rpt_folder_window.submit "Submit">
+<!ENTITY reports.oils_rpt_folder_window.limit_output "Limit output to ">
+<!ENTITY reports.oils_rpt_folder_window.all "All">
+<!ENTITY reports.oils_rpt_folder_window.pending_items "Pending Items">
+<!ENTITY reports.oils_rpt_folder_window.new_template "Create a new Template for this folder">
+<!ENTITY reports.oils_rpt_folder_window.no_items_to_display "No items to display">
+<!ENTITY reports.oils_rpt_folder_window.completed_items "Completed Items">
+<!ENTITY reports.oils_rpt_folder_window.selected_folder "Selected Folder: ">
+<!ENTITY reports.oils_rpt_folder_window.select_folder "Select Folder">
+<!ENTITY reports.oils_rpt_folder_window.cancel "Cancel">
+<!ENTITY reports.oils_rpt_folder_window.confirm_delete "Are you sure you wish to delete the selected item(s)?">
+<!ENTITY reports.oils_rpt_folder_window.dependant_reports_no_delete "One or more of the selected templates could not be deleted because there are reports that depend on them.">
+<!ENTITY reports.oils_rpt_folder_window.dependant_outputs_no_delete "One or more of The selected reports could not be deleted because there are outputs that depend on them.">
+<!ENTITY reports.oils_rpt_folder_window.cannot_delete_another_users_data "You may not delete another user's items">
+<!ENTITY reports.oils_rpt_folder_window.cannot_move_another_users_data "You may not move another user's items">
+<!ENTITY reports.oils_rpt_folder_window.delete_all_attached_reports "
+        This will also delete all of your attached reports and outputs for
+        this template.  
+
+        If other users have reports or outputs attached to this template,
+        those will be left untouched and the template will not be deleted.
+        
+        Do you wish to continue?">
+<!ENTITY reports.oils_rpt_folder_window.delete_all_attached_outputs "
+        This will also delete all of your attached outputs for
+        this report.  
+        
+        If other users have outputs attached to this report,
+        those will be left untouched and the report will not be deleted.
+        
+        Do you wish to continue?">
+
+
+<!ENTITY reports.oils_rpt_param_editor.column "Column">
+<!ENTITY reports.oils_rpt_param_editor.transform "Transform">
+<!ENTITY reports.oils_rpt_param_editor.action "Action">
+<!ENTITY reports.oils_rpt_param_editor.user_params "User Params">
+<!ENTITY reports.oils_rpt_param_editor.or "OR">
+<!ENTITY reports.oils_rpt_param_editor.use_relative_date "Use a relative date instead.">
+<!ENTITY reports.oils_rpt_param_editor.days "Day(s)">
+<!ENTITY reports.oils_rpt_param_editor.weeks "Weeks(s)">
+<!ENTITY reports.oils_rpt_param_editor.months "Months(s)">
+<!ENTITY reports.oils_rpt_param_editor.ago " ago">
+
+
+<!ENTITY reports.xul.template_builder.db_source_browser.label "Database Source Browser">
+<!ENTITY reports.xul.template_builder.sources_menulist.label "Sources">
+<!ENTITY reports.xul.template_builder.source_name.label "Source Name">
+<!ENTITY reports.xul.template_builder.source_specifier.label "Source Specifier:">
+<!ENTITY reports.xul.template_builder.field_name.label "Field Name">
+<!ENTITY reports.xul.template_builder.data_type.label "Data Type">
+<!ENTITY reports.xul.template_builder.field_transform.label "Field Transform">
+<!ENTITY reports.xul.template_builder.params.label "Params">
+<!ENTITY reports.xul.template_builder.applicable_datatypes.label "Applicable Datatypes">
+<!ENTITY reports.xul.template_builder.output_type.label "Output Type">
+<!ENTITY reports.xul.template_builder.template_config_caption.label "Template Configuration">
+<!ENTITY reports.xul.template_builder.name.label "Name:">
+<!ENTITY reports.xul.template_builder.description.label "Description:">
+<!ENTITY reports.xul.template_builder.save.label "Save">
+<!ENTITY reports.xul.template_builder.displayed_fields.label "Displayed Fields">
+<!ENTITY reports.xul.template_builder.base_filters.label "Base Filters">
+<!ENTITY reports.xul.template_builder.aggregate_filters.label "Aggregate Filters">
+<!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">
+<!ENTITY reports.xul.template_builder.filter_field.label "Filter Field">
+<!ENTITY reports.xul.template_builder.operator.label "Operator">
+<!ENTITY reports.xul.template_builder.value.label "Value">
+<!ENTITY reports.xul.template_builder.change_transform.label "Change Transform">
+<!ENTITY reports.xul.template_builder.change_operator.label "Change Operator">
+<!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">
diff --git a/Open-ILS/web/reports/oils_rpt.xhtml b/Open-ILS/web/reports/oils_rpt.xhtml
index fdda302318..967060e99f 100644
--- a/Open-ILS/web/reports/oils_rpt.xhtml
+++ b/Open-ILS/web/reports/oils_rpt.xhtml
@@ -4,12 +4,13 @@
 	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
 	<!ENTITY nbsp " ">
+	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<head>
-		<title>Evergreen: Reports</title>
+		<title>&reports.oils_rpt.title;</title>
 		<!--#include virtual="oils_rpt_common.xhtml"-->
 		<script type="text/javascript">
 		<![CDATA[
@@ -26,11 +27,11 @@
 
 	<body>
 		<div class='welcome_box'>
-			<span>You are logged in as </span><b><span id='oils_rpt_user'/></b>
+			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
 		</div>
 
 		<div id='oils_rpt_permission_denied' class='hide_me'>
-			You do not have sufficient permissions to run reports
+			&reports.oils_rpt.insufficient_permissions;
 		</div>
 
 		<!--
@@ -40,7 +41,7 @@
 		-->
 
 		<div id='oils_rpt_tree_loading'>
-			Loading...
+			&reports.common.loading;
 		</div>
 
 		<table id='oils_rpt_folder_table' class='hide_me'>
@@ -48,13 +49,13 @@
 				<tr>
 					<td id='oils_rpt_folder_table_left_td'>
 						<div class='oils_rpt_folder_tree_div'>
-							<div><b>My Folders</b></div>
+							<div><b>&reports.oils_rpt.my_folders;</b></div>
 							<div id='oils_rpt_template_folder_tree' class='oils_rpt_folder_tree'/>
 							<div id='oils_rpt_report_folder_tree' class='oils_rpt_folder_tree'/>
 							<div id='oils_rpt_output_folder_tree' class='oils_rpt_folder_tree'/>
 						</div>
 						<div class='oils_rpt_folder_tree_div'>
-							<div><b>Shared Folders</b></div>
+							<div><b>&reports.oils_rpt.shared_folders;</b></div>
 							<div id='oils_rpt_template_shared_folder_tree' class='oils_rpt_folder_tree'/>
 							<div id='oils_rpt_report_shared_folder_tree' class='oils_rpt_folder_tree'/>
 							<div id='oils_rpt_output_shared_folder_tree' class='oils_rpt_folder_tree'/>
@@ -67,9 +68,9 @@
 							<table class='oils_rpt_tab_table' id='oils_rpt_folder_manager_tab_table'><tbody>
 								<tr>
 									<td width='50%'>
-										<a id='oils_rpt_folder_window_manage_tab' href='javascript:void(0);'>Manage Folder Contents</a></td>
+										<a id='oils_rpt_folder_window_manage_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder_contents;</a></td>
 									<td width='50%'>
-										<a id='oils_rpt_folder_window_edit_tab' href='javascript:void(0);'>Manage Folder</a></td>
+										<a id='oils_rpt_folder_window_edit_tab' href='javascript:void(0);'>&reports.oils_rpt.manage_folder;</a></td>
 								</tr>
 							</tbody></table>
 
@@ -78,7 +79,7 @@
 									<tr>
 										<td>
 											<span><b id='oils_rpt_folder_name_label'/>: 
-											created by </span> <b id='oils_rpt_folder_creator_label'/>
+											&reports.oils_rpt.created_by;</span> <b id='oils_rpt_folder_creator_label'/>
 										</td>
 									</tr>
 								</tbody>
@@ -100,36 +101,35 @@
 
 						<div id='oils_rpt_top_folder' class='hide_me oils_rpt_folder_window'>
 							<div>
-								<span><b>Create a new sub-folder</b>.  Folder type: </span> <b id='oils_rpt_top_folder_type'/>
+								<span><b>&reports.oils_rpt.create_new_sub_folder;</b>. &reports.oils_rpt.folder_type;</span> <b id='oils_rpt_top_folder_type'/>
 							</div>
 							<table class='oils_rpt_generic_table'>
 								<tbody>
 									<tr>
-										<td>Folder Name:</td>
+										<td>&reports.oils_rpt.folder_name;</td>
 										<td><input id='oils_rpt_top_folder_name' type='text'/></td>
 									</tr>
 									<tr>
-										<td>Share this folder:</td>
+										<td>&reports.oils_rpt.share_folder;</td>
 										<td>
 											<select id='oils_rpt_top_folder_shared'>
-												<option value='f' selected='selected'>Do not share</option>
-												<option value='t'>Share</option>
+												<option value='f' selected='selected'>&reports.oils_rpt.do_not_share;</option>
+												<option value='t'>&reports.oils_rpt.share;</option>
 											</select>
 										</td>
 									</tr>
 									<tr>
-										<td>Share with:</td>
+										<td>&reports.oils_rpt.share_with;</td>
 										<td><select id='oils_rpt_top_folder_lib_picker'/></td>
 									</tr>
 									<tr><td colspan='2' align='center'>
-										<input type='submit' value='Create Sub Folder' id='oils_rpt_top_folder_create'/>
+										<input type='submit' value='&reports.oils_rpt.create_sub_folder;' id='oils_rpt_top_folder_create'/>
 									</td></tr>
 								</tbody>
 							</table>
 						</div>
 					</td>
 
-
 				</tr>
 			</tbody>
 		</table>
diff --git a/Open-ILS/web/reports/oils_rpt_builder.xhtml b/Open-ILS/web/reports/oils_rpt_builder.xhtml
index 4a68835ea4..b65246f92e 100644
--- a/Open-ILS/web/reports/oils_rpt_builder.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_builder.xhtml
@@ -4,12 +4,13 @@
 	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
 	<!ENTITY nbsp " ">
+	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<head>
-		<title>Evergreen: Report Builder</title>
+		<title>&reports.oils_rpt_builder.title;</title>
 		<!--#include virtual="oils_rpt_common.xhtml"-->
 		<script type="text/javascript">
 		<![CDATA[
@@ -23,18 +24,18 @@
 	<body>
 
 		<div class='welcome_box'>
-			<span>You are logged in as </span><b><span id='oils_rpt_user'/></b>
+			<span>&reports.common.logged_in_as;</span><b><span id='oils_rpt_user'/></b>
 		</div>
 
 		<div>
-			<a class='oils_rpt_main_link' href='javascript:_l("oils_rpt.xhtml");'>Reports Home</a>
+			<a class='oils_rpt_main_link' href='javascript:_l("oils_rpt.xhtml");'>&reports.oils_rpt_builder.reports_home;</a>
 			<span id='oils_rpt_builder_cloning' class='hide_me' style='padding-left: 10px;'>
-				(<b>Cloning template "<span id='oils_rpt_build_cloning_name'/>"</b>)
+				(<b>&reports.oils_rpt_builder.cloning_template; "<span id='oils_rpt_build_cloning_name'/>"</b>)
 			</span>
 		</div>
 
 		<div id='oils_rpt_tree_loading'>
-			Loading...
+			&reports.common.loading;
 		</div>
 
 		<table class='hide_me' id='oils_rpt_table'>
@@ -44,16 +45,16 @@
 
 						<table id='oils_rpt_name_table'><tbody>
 							<tr>
-								<td width='20%'>Template Name: </td>
+								<td width='20%'>&reports.oils_rpt_builder.template_name;</td>
 								<td><input size='32' id='oils_rpt_builder_new_name'/></td>
 							</tr><tr>
-								<td>Template Description: </td>
+								<td>&reports.oils_rpt_builder.template_description;</td>
 								<td><textarea cols='50' rows='2' id='oils_rpt_builder_new_desc'/></td>
 							</tr><tr>
-								<td>Template Type: </td>
+								<td>&reports.oils_rpt_builder.template_type;</td>
 								<td><select id='oils_rpt_builder_type_selector'/></td>
 							</tr><tr>
-								<td>Save this Template: </td>
+								<td>&reports.oils_rpt_builder.save_this_template;</td>
 								<td><input type='submit' value='Save Template' id='oils_rpt_builder_save_template'/></td>
 							</tr>
 						</tbody></table>
@@ -66,46 +67,46 @@
 						<div>
 							<b>**</b>
 							<span style='padding-left: 6px;'>
-								Indicates that when filtering on the item, a list of named choices will be generated.
+								&reports.oils_rpt_builder.filtering_note;
 							</span>
 						</div>
 
 					</td>
 					<td id='oils_rpt_table_right_td' align='right'>
 						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>Template Display Items</div>
+							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.temp_disp_items;</div>
 							<select id='oils_rpt_display_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedDisplayItems();'><u>X</u> Remove Selected</button>
-							<button onclick='oilsMoveUpDisplayItems();'>Move &uarr;</button>
-							<button onclick='oilsMoveDownDisplayItems();'>Move &darr;</button>
+							<button onclick='oilsDelSelectedDisplayItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
+							<button onclick='oilsMoveUpDisplayItems();'>&reports.oils_rpt_builder.move_up;</button>
+							<button onclick='oilsMoveDownDisplayItems();'>&reports.oils_rpt_builder.move_down;</button>
 						</div>
 						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>Template Filters</div>
+							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.template_filters;</div>
 							<select id='oils_rpt_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedFilterItems();'><u>X</u> Remove Selected</button>
+							<button onclick='oilsDelSelectedFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
 						</div>
 						<div class='oils_rpt_info_div'>
-							<div class='oils_rpt_info_item oils_rpt_info_title'>Report Aggregate Filters</div>
+							<div class='oils_rpt_info_item oils_rpt_info_title'>&reports.oils_rpt_builder.report_aggregate_filters;</div>
 							<select id='oils_rpt_agg_filter_selector' class='oils_rpt_info_item oils_rpt_info_selector' multiple='multiple'/>
-							<button onclick='oilsDelSelectedAggFilterItems();'><u>X</u> Remove Selected</button>
+							<button onclick='oilsDelSelectedAggFilterItems();'><u>X</u> &reports.oils_rpt_builder.remove_selected;</button>
 						</div>
 						<div class='oils_rpt_info_div'>
-							<span style='color:red;font-weight:bold;'>Hint: </span> Double-click on an item to see the item details.
+							<span style='color:red;font-weight:bold;'>&reports.oils_rpt_builder.hint;</span> &reports.oils_rpt_builder.hint_item_details;
 						</div>
 					</td>	
 				</tr>
 			</tbody>
 		</table>
-		<span class='hide_me' id='oils_rpt_tree_label'>Template Types</span>
+		<span class='hide_me' id='oils_rpt_tree_label'>&reports.oils_rpt_builder.template_types;</span>
 
 
 		<div id='oils_rpt_column_editor' class='floaty hide_me'>
 
 			<table id='oils_rpt_editor_tab_table' class='oils_rpt_tab_table'><tbody>
 				<tr>
-					<td width='25%' class='oils_rpt_tab_picker_selected'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>Display Items</a></td>
-					<td width='25%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>Filters</a></td>
-					<td width='25%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>Aggregate Filters</a></td>
+					<td width='25%' class='oils_rpt_tab_picker_selected'><a id='oils_rpt_tform_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.display_items;</a></td>
+					<td width='25%'><a id='oils_rpt_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.filters;</a></td>
+					<td width='25%'><a id='oils_rpt_agg_filter_tab' href='javascript:void(0);'>&reports.oils_rpt_builder.aggregate_filters;</a></td>
 					<!--
 					<td width='25%'><a id='oils_rpt_order_by_tab' href='javascript:void(0);'>Column Sorting</a></td>
 					-->
@@ -119,25 +120,25 @@
 			<div id='oils_rpt_tform_div'>
 				<input size='42' id='oils_rpt_tform_label_input'/>
 				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>Select how this field should be displayed:</div>
+					<div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.field_editor_window.label;</div>
 					<div id='oils_rpt_tform_table'/>
 				</div>
 				<br/><br/>
-				<button id='oils_rpt_tform_submit'>Add Item</button>
+				<button id='oils_rpt_tform_submit'>&reports.oils_rpt_builder.add_item;</button>
 			</div>
 
 			<div id='oils_rpt_filter_div' class='hide_me'>
 				<div class='oils_rpt_field_editor_window'>
-					<div style='margin-bottom: 10px;'>Select what filter should be applied to this field:</div>
+					<div style='margin-bottom: 10px;'>&reports.oils_rpt_builder.select_filter_to_apply;</div>
 					<div>
 						<table><tbody><tr>
-							<td>Choose a Transform: </td>
+							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
 							<td>
 								<div id='oils_rpt_filter_tform_table'/>
 							</td>
 						</tr>
 						<tr>	
-							<td>Choose a Filter: </td>
+							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
 							<td>
 								<div id='oils_rpt_filter_op_table'/>
 							</td>
@@ -145,30 +146,30 @@
 					</div>
 
 				</div>
-				<button id='oils_rpt_filter_submit'>Create Filter</button>
+				<button id='oils_rpt_filter_submit'>&reports.oils_rpt_builder.create_filter;</button>
 			</div>
 
 			<div id='oils_rpt_agg_filter_div' class='hide_me'>
 				<div class='oils_rpt_field_editor_window'>
 					<div style='margin-bottom: 10px;'>
-						Select what aggregate filter should be applied to this field:
+						&reports.oils_rpt_builder.aggregate_filter_to_apply;
 					</div>
 					<div>
 						<table><tbody><tr>
-							<td>Choose a Transform: </td>
+							<td>&reports.oils_rpt_builder.choose_a_transform;</td>
 							<td>
 								<div id='oils_rpt_agg_filter_tform_table'/>
 							</td>
 						</tr>
 						<tr>	
-							<td>Choose a Filter: </td>
+							<td>&reports.oils_rpt_builder.choose_a_filter;</td>
 							<td>
 								<div id='oils_rpt_agg_filter_op_table'/>
 							</td>
 						</tr></tbody></table>
 					</div>
 				</div>
-				<button id='oils_rpt_agg_filter_submit'>Create Aggregate Filter</button>
+				<button id='oils_rpt_agg_filter_submit'>&reports.oils_rpt_builder.create_aggregate_filter;</button>
 			</div>
 
 
@@ -176,41 +177,40 @@
 			<div id='oils_rpt_order_by_div' class='hide_me'>
 				<div class='oils_rpt_field_editor_window'>
 					<div style='margin-bottom: 10px;'>
-						Select how the columns should be sorted
+						&reports.oils_rpt_builder.selected_to_sort_columns;
 					</div>
 					<div>
 						<table><tbody>
 							<tr>
-							<td>Choose a column: </td>
+							<td>&reports.oils_rpt_builder.choose_column;</td>
 							<td>
 								<select id='oils_rpt_order_by_selector'/>
 							</td>
 						</tr>
 						<tr>	
-							<td>Choose the direction the sorting should occur: </td>
+							<td>&reports.oils_rpt_builder.choose_sorting_direction;</td>
 							<td>
 								<select id='oils_rpt_order_by_dir'>
-									<option value='ascending' selected='selected'>Ascending</option>
-									<option value='descending'>Descending</option>
+									<option value='ascending' selected='selected'>&reports.oils_rpt_builder.ascending;</option>
+									<option value='descending'>&reports.oils_rpt_builder.descending;</option>
 								</select>
 							</td>
 						</tr></tbody></table>
 					</div>
 				</div>
-				<button id='oils_rpt_order_by_submit'>Add Sort</button>
+				<button id='oils_rpt_order_by_submit'>&reports.oils_rpt_builder.add_sort;</button>
 			</div>
 
 
 
 			<div id='oils_rpt_column_editor_close_div'>
-				<button id='oils_rpt_column_editor_close_button'>Close Window</button>
+				<button id='oils_rpt_column_editor_close_button'>&reports.oils_rpt_builder.close_window;</button>
 			</div>
 		</div>
 
 
 		<span class='hide_me' id='oils_rpt_confirm_new_report'>
-			This will destroy the report you are currently constructing.  
-			Are you sure you wish to do this?
+			&reports.oils_rpt_builder.confirm_new_report;
 		</span>
 
 	</body>
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml
index bbb4b4a1ce..4cbb83aebc 100644
--- a/Open-ILS/web/reports/oils_rpt_common.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_common.xhtml
@@ -76,11 +76,11 @@
 
 
 <span class='hide_me' id='oils_rpt_generic_success'>
-	Action Succeeded
+	&reports.oils_rpt_common.action_succeeded;
 </span>
 
 <span class='hide_me' id='oils_rpt_generic_failure'>
-	Action Failed
+	&reports.oils_rpt_common.action_failed;
 </span>
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index c277bd5fe9..11b884b8a2 100644
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -2,20 +2,20 @@
 	<table width='100%' id='oils_rpt_editor_table'>
 		<tbody>
 			<tr>
-				<th>Template Name:</th>
+				<th>&reports.oils_rpt_editor.template_name;</th>
 				<td><span id='oils_rpt_report_editor_template_name'/></td>
 			</tr>
 			<tr>
-				<th>Template Creator:</th>
+				<th>&reports.oils_rpt_editor.template_creator;</th>
 				<td><span id='oils_rpt_report_editor_template_creator'/></td>
 			</tr>
 			<tr>
-				<th>Template Description:</th>
+				<th>&reports.oils_rpt_editor.template_description;</th>
 				<td><span id='oils_rpt_report_editor_template_description'/></td>
 			</tr>
 
 			<tr>
-				<th>Report Name:</th>
+				<th>&reports.oils_rpt_editor.report_name;</th>
 				<script>
 					var oils_rpt_report_editor_name_func = function(obj) {
 						if(obj.value) removeCSSClass(obj, OILS_RPT_INVALID_DATA);
@@ -29,23 +29,23 @@
 				</td>
 			</tr>
 			<tr>
-				<th>Report Description:</th>
+				<th>&reports.oils_rpt_editor.report_description;</th>
 				<td><textarea cols='45' rows='2' id='oils_rpt_report_editor_desc'/></td>
 			</tr>
 			<tr>
-				<th>Report Columns:</th>
+				<th>&reports.oils_rpt_editor.report_columns;</th>
 				<td><b id='oils_rpt_report_editor_cols'/></td>
 			</tr>
 			<tr class='hide_me' id='oils_rpt_editor_pivot_label_row'>
-				<th>Pivot Label Column:</th>
+				<th>&reports.oils_rpt_editor.pivot_label_column;</th>
 				<td>
                     <select id='oils_rpt_editor_pivot_label'>
-                        <option selected='selected' value=''> -- Select One (optional) -- </option>
+                        <option selected='selected' value=''> -- &reports.oils_rpt_editor.select_option; -- </option>
                     </select>
                 </td>
 			</tr>
 			<tr class='hide_me' id='oils_rpt_editor_pivot_data_row'>
-				<th>Pivot Data Column:</th>
+				<th>&reports.oils_rpt_editor.pivot_data_column;</th>
 				<td>
                     <select id='oils_rpt_editor_pivot_data'>
                     </select>
@@ -56,10 +56,10 @@
 			<tr><td colspan='2'><hr/></td></tr>
 			-->
 			<tr>
-				<th>Choose a folder to store this report definition: </th>
+				<th>&reports.oils_rpt_editor.store_report_definition;</th>
 				<td>
 					<div style='margin-bottom: 7px;'>
-						<span>Selected Folder: </span>
+						<span>&reports.oils_rpt_editor.selected_folder;</span>
 						<b id='oils_rpt_report_editor_selected_folder'/>
 					</div>
 					<span id='oils_rpt_report_editor_dest_folder'/>
@@ -83,18 +83,18 @@
 			-->
 			<tr>
 				<td colspan='2'>
-					<div><b>Output Options</b></div>
+					<div><b>&reports.oils_rpt_editor.output_options;</b></div>
 					<ul>
-						<li><input type="checkbox" id="oils_rpt_format_excel" value="t" checked="checked"/><span>Excel Output</span></li>
-						<li><input type="checkbox" id="oils_rpt_format_csv" value="t"/><span>CSV Output</span></li>
+						<li><input type="checkbox" id="oils_rpt_format_excel" value="t" checked="checked"/><span>&reports.oils_rpt_editor.excel_output;</span></li>
+						<li><input type="checkbox" id="oils_rpt_format_csv" value="t"/><span>&reports.oils_rpt_editor.csv_output;</span></li>
 						<li>
-							<input type="checkbox" id="oils_rpt_format_html" value="t" checked="checked"/>HTML Output
+							<input type="checkbox" id="oils_rpt_format_html" value="t" checked="checked"/>&reports.oils_rpt_editor.html_output;
 							<ul>
-								<li><input type="checkbox" id="oils_rpt_format_chart_bar" value="t" checked="checked"/><span>Bar Charts</span></li>
+								<li><input type="checkbox" id="oils_rpt_format_chart_bar" value="t" checked="checked"/><span>&reports.oils_rpt_editor.bar_charts;</span></li>
 								<!--
 								<li><input type="checkbox" id="oils_rpt_format_chart_pie" value="t"/><span>Pie Charts</span></li>
 								-->
-								<li><input type="checkbox" id="oils_rpt_format_chart_line" value="t"/><span>Line Charts</span></li>
+								<li><input type="checkbox" id="oils_rpt_format_chart_line" value="t"/><span>&reports.oils_rpt_editor.line_charts;</span></li>
 							</ul>
 						</li>
 					</ul>
@@ -105,7 +105,7 @@
 			<tr><td colspan='2'><hr/></td></tr>
 			-->
 			<tr>
-				<th>Recurring Report: </th>
+				<th>&reports.oils_rpt_editor.recurring_report;</th>
 				<td>
 					<input type="checkbox" id="oils_rpt_recur" value="t"
 						onclick='
@@ -120,7 +120,7 @@
 				</td>
 			</tr>
 			<tr>
-				<th>Recurrence Interval: </th>
+				<th>&reports.oils_rpt_editor.recurring_interval;</th>
 				<td>
 					<select id="oils_rpt_recur_count" disabled='disabled'>
 						<option value='1'>1</option>
@@ -149,15 +149,15 @@
 						<option value='24'>24</option>
 					</select>
 					<select id="oils_rpt_recur_interval_type" disabled='disabled'>
-						<option value="days">Day(s)</option>
-						<option value="weeks">Week(s)</option>
-						<option value="months">Month(s)</option>
+						<option value="days">&reports.oils_rpt_editor.days;</option>
+						<option value="weeks">&reports.oils_rpt_editor.weeks;</option>
+						<option value="months">&reports.oils_rpt_editor.months;</option>
 					</select>
 				</td>
 			</tr>
 			<tr>
 				<th>
-					<span>Run ASAP </span>
+					<span>&reports.oils_rpt_editor.run_asap;</span>
 						<input type='checkbox' id='oils_rpt_report_editor_run_now'
 							onclick='
 								if(this.checked) {
@@ -169,13 +169,13 @@
 								}
 							'
 						/>
-					<span> or at: </span>
+					<span>&reports.oils_rpt_editor.or_at;</span>
 				</th>
 				<td>
 					<input id="oils_rpt_param_editor_sched_start_date" type="text" size="10"/>
-						at
+						&reports.oils_rpt_editor.at;
 					<select id='oils_rpt_param_editor_sched_start_hour'>
-						<option value="00:00">Midnight</option>
+						<option value="00:00">&reports.oils_rpt_editor.midnight;</option>
 						<option value="01:00">1 AM</option>
 						<option value="02:00">2 AM</option>
 						<option value="03:00">3 AM</option>
@@ -187,7 +187,7 @@
 						<option value="09:00">9 AM</option>
 						<option value="10:00">10 AM</option>
 						<option value="11:00">11 AM</option>
-						<option value="12:00">Noon</option>
+						<option value="12:00">&reports.oils_rpt_editor.noon;</option>
 						<option value="13:00">1 PM</option>
 						<option value="14:00">2 PM</option>
 						<option value="15:00">3 PM</option>
@@ -203,14 +203,14 @@
 				</td>
 			</tr>
 			<tr>
-				<th>Send completion notification to this Email address: </th>
+				<th>&reports.oils_rpt_editor.sent_to_email;</th>
 				<td><input id="oils_rpt_param_editor_sched_email" type="text" size="25"/></td>
 			</tr>
 			<tr>
-				<th>Choose a folder to store this report's output: </th>
+				<th>&reports.oils_rpt_editor.storage_folder_for_output;</th>
 				<td>
 					<div style='margin-bottom: 7px;'>
-						<span>Selected Folder: </span>
+						<span>&reports.oils_rpt_editor.selected_folder;</span>
 						<b id='oils_rpt_output_selected_folder'/>
 					</div>
 					<span id='oils_rpt_output_dest_folder'/>
@@ -219,7 +219,7 @@
 
 			<tr>
 				<td colspan='2'>
-					<input id='oils_rpt_report_editor_save' type='submit' value='Save Report'/>
+					<input id='oils_rpt_report_editor_save' type='submit' value='&reports.oils_rpt_editor.save_report;'/>
 				</td>
 			</tr>
 
@@ -227,12 +227,11 @@
 	</table>
 
 	<span id='oils_rpt_empty_param' class='hide_me'>
-		One or more of the user-defined parameters has been left empty.
-		Please fill in all fields.
+		&reports.oils_rpt_editor.empty_parameter;
 	</span>
 
     <span id='oils_rpt_report_exists' class='hide_me'>
-        There is already a report in this folder with the given name.
+        &reports.oils_rpt_editor.same_name;
     </span>
 
 </div>
diff --git a/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml b/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
index 5b78ba5ab0..6dd8446b5d 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_manager.xhtml
@@ -1,46 +1,46 @@
 <div id='oils_rpt_folder_manager_div' class='hide_me' style='margin-top: 10px; text-align: center;'>
 	<select id='oils_rpt_folder_manager_actions'>
-		<option value='change_name'>Change folder name</option>
-		<option value='delete' id='oils_rpt_folder_manager_delete_opt'>Delete this folder</option>
-		<option value='create_sub_folder'>Create a new sub-folder</option>
-		<option id='oils_rpt_folder_manager_share_opt' value='share'>Share this folder</option>
-		<option id='oils_rpt_folder_manager_unshare_opt' value='unshare'>Hide (un-share) this folder</option>
+		<option value='change_name'>&reports.oils_rpt_folder_manager.change_folder_name;</option>
+		<option value='delete' id='oils_rpt_folder_manager_delete_opt'>&reports.oils_rpt_folder_manager.delete_folder;</option>
+		<option value='create_sub_folder'>&reports.oils_rpt_folder_manager.create_new_sub_folder;</option>
+		<option id='oils_rpt_folder_manager_share_opt' value='share'>&reports.oils_rpt_folder_manager.share_this_folder;</option>
+		<option id='oils_rpt_folder_manager_unshare_opt' value='unshare'>&reports.oils_rpt_folder_manager.hide_folder;</option>
 
-		<option class='hide_me'>Disable recurrence</option><!-- XXX -->
+		<option class='hide_me'>&reports.oils_rpt_folder_manager.disable_recurrence;</option><!-- XXX -->
 
 	</select>
-	<input id='oils_rpt_folder_manager_actions_submit' type='submit' value='Go'/>
+	<input id='oils_rpt_folder_manager_actions_submit' type='submit' value='&reports.oils_rpt_folder_manager.fldr_mngr_actions_submit;'/>
 
 	<div id='oils_rpt_folder_manager_action_div' style='margin: 15px;'>
 
 		<div id='oils_rpt_folder_manager_change_name_div'>
-			Enter new name: 
+			&reports.oils_rpt_folder_manager.change_name; 
 			<input id='oils_rpt_folder_manager_name_input' type='text'/>
-			<input type='submit' value='Submit' id='oils_rpt_folder_manager_change_name_submit'/>
+			<input type='submit' value='&reports.oils_rpt_folder_manager.submit;' id='oils_rpt_folder_manager_change_name_submit'/>
 		</div>
 
 		<div id='oils_rpt_folder_manager_create_sub'>
 			<table class='oils_rpt_generic_table'>
 				<tbody>
 					<tr>
-						<td>Folder Name:</td>
+						<td>&reports.oils_rpt_folder_manager.folder_name;</td>
 						<td><input id='oils_rpt_folder_manager_sub_name' type='text'/></td>
 					</tr>
 					<tr>
-						<td>Share this folder:</td>
+						<td>&reports.oils_rpt_folder_manager.share_this_folder;</td>
 						<td>
 							<select id='oils_rpt_folder_manager_sub_shared'>
-								<option value='no' selected='selected'>Do not share</option>
-								<option value='yes'>Share</option>
+								<option value='no' selected='selected'>&reports.oils_rpt_folder_manager.do_not_share;</option>
+								<option value='yes'>&reports.oils_rpt_folder_manager.share;</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td>Share with:</td>
+						<td>&reports.oils_rpt_folder_manager.share_with;</td>
 						<td><select id='oils_rpt_folder_manager_sub_lib_picker'/></td>
 					</tr>
 					<tr><td colspan='2' align='center'>
-						<input type='submit' value='Create Sub Folder' 
+						<input type='submit' value='&reports.oils_rpt_folder_manager.create_sub_folder;' 
 							id='oils_rpt_folder_manager_sub_lib_create'/>
 					</td></tr>
 				</tbody>
@@ -51,11 +51,11 @@
 			<table class='oils_rpt_generic_table'>
 				<tbody>
 					<tr>
-						<td>Share with:</td>
+						<td>&reports.oils_rpt_folder_manager.share_with;</td>
 						<td><select id='oils_rpt_folder_manager_share_lib_picker'/></td>
 					</tr>
 					<tr><td colspan='2' align='center'>
-						<input type='submit' value='Share this folder' 
+						<input type='submit' value='&reports.oils_rpt_folder_manager.share_this_folder;' 
 							id='oils_rpt_folder_manager_share_submit'/>
 					</td></tr>
 				</tbody>
@@ -66,25 +66,25 @@
 	</div>
 
 	<span class='hide_me' id='oils_rpt_folder_manager_change_name_confirm'>
-		Are you sure you wish to change this folder's name?
+		&reports.oils_rpt_folder_manager.change_name_confirm;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_folder_manager_delete_confirm'>
-		Are you sure you wish to delete this folder?
+		&reports.oils_rpt_folder_manager.delete_name_confirm;
 	</span>
 		
 	<span class='hide_me' id='oils_rpt_folder_cannot_delete'>
-		This folder may not be deleted because it is not empty.
+		&reports.oils_rpt_folder_manager.cannot_delete;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_folder_already_shared'>
-		This folder is already shared
+		&reports.oils_rpt_folder_manager.already_shared;
 	</span>
 	<span class='hide_me' id='oils_rpt_folder_already_unshared'>
-		This folder is not shared
+		&reports.oils_rpt_folder_manager.folder_not_shared;
 	</span>
 	<span class='hide_me' id='oils_rpt_folder_unshare_confirm'>
-		Are you sure you wish to hide this folder?
+		&reports.oils_rpt_folder_manager.confirm_hide_folder;
 	</span>
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index 5aab176303..df1ee86475 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -12,41 +12,41 @@
 				<td colspan='2'> 
 					<span>
 						<select id='oils_rpt_folder_contents_action_selector' style='width: auto;'>
-							<option type='template' value='create_report'>Create a new report from selected template</option>
-							<option type='template' value='clone_template'>Clone selected template</option>
-							<option type='template' value='delete_template'>Delete selected template(s)</option>
-							<option type='report' value='change_params' disabled='disabled'>Clone report</option>
-							<option type='report' value='schedule_report' disabled='disabled'>Schedule report</option>
-							<option type='report' value='delete_report'>Delete selected report(s)</option>
-							<option type='output' value='show_output'>View report output</option>
-							<option type='output' value='delete_output'>Delete selected output(s)</option>
-
-							<option type='template' value='move_template'>Move the selected template(s) to a different folder</option>
-							<option type='report' value='move_report'>Move the select report(s) to a different folder</option>
-							<option type='output' value='move_output'>Move the selected output(s) to a different folder</option>
+							<option type='template' value='create_report'>&reports.oils_rpt_folder_window.new_report_from_template;</option>
+							<option type='template' value='clone_template'>&reports.oils_rpt_folder_window.clone_template;</option>
+							<option type='template' value='delete_template'>&reports.oils_rpt_folder_window.delete_template;</option>
+							<option type='report' value='change_params' disabled='disabled'>&reports.oils_rpt_folder_window.clone_report;</option>
+							<option type='report' value='schedule_report' disabled='disabled'>&reports.oils_rpt_folder_window.schedule_report;</option>
+							<option type='report' value='delete_report'>&reports.oils_rpt_folder_window.delete_reports;</option>
+							<option type='output' value='show_output'>&reports.oils_rpt_folder_window.view_report_output;</option>
+							<option type='output' value='delete_output'>&reports.oils_rpt_folder_window.delete_output;</option>
+
+							<option type='template' value='move_template'>&reports.oils_rpt_folder_window.move_templates;</option>
+							<option type='report' value='move_report'>&reports.oils_rpt_folder_window.move_reports;</option>
+							<option type='output' value='move_output'>&reports.oils_rpt_folder_window.move_output;</option>
 						</select>
 					</span>
-					<input type='submit' value='Submit' id='oils_rpt_folder_content_action_go'/>
+					<input type='submit' value='&reports.oils_rpt_folder_window.submit;' id='oils_rpt_folder_content_action_go'/>
 				</td>
 			</tr>
 
 			<tr id='oils_rpt_content_count_row'>
 				<td style='text-align:left;'>
 					<div>
-						Limit output to 
+						&reports.oils_rpt_folder_window.limit_output;
 						<select id='oils_rpt_output_limit_selector'>
 							<option value='5'>5</option>
 							<option value='10'>10</option>
 							<option value='25'>25</option>
 							<option value='50'>50</option>
-							<option value=''>All</option>
+							<option value=''>&reports.oils_rpt_folder_window.all;</option>
 						</select>
-						<span><b id='oils_rpt_pending_output' class='hide_me'>Pending Items</b></span>
+						<span><b id='oils_rpt_pending_output' class='hide_me'>&reports.oils_rpt_folder_window.pending_items;</b></span>
 					</div>
 				</td>
 				<td style='text-align:right;'>
 					<a id='oils_rpt_folder_window_contents_new_template' 
-						href='javascript:void(0);'><b>Create a new Template for this folder</b></a>
+						href='javascript:void(0);'><b>&reports.oils_rpt_folder_window.new_template;</b></a>
 				</td>
 			</tr>
 
@@ -57,7 +57,7 @@
 			</tr>
 
 			<tr class='hide_me' id='oils_rpt_content_row_empty'>
-				<td style='text-align:left;'><b>No items to display</b></td>
+				<td style='text-align:left;'><b>&reports.oils_rpt_folder_window.no_items_to_display;</b></td>
 			</tr>
 
 
@@ -67,15 +67,15 @@
 			<tr id='oils_rpt_content_count_row_2' class='hide_me'>
 				<td style='text-align:left;padding-top: 20px;'>
 					<div>
-						Limit output to 
+						&reports.oils_rpt_folder_window.limit_output;
 						<select id='oils_rpt_output_limit_selector_2'>
 							<option value='5'>5</option>
 							<option value='10'>10</option>
 							<option value='25'>25</option>
 							<option value='50'>50</option>
-							<option value=''>All</option>
+							<option value=''>&reports.oils_rpt_folder_window.all;</option>
 						</select>
-						<span><b>Completed Items</b></span>
+						<span><b>&reports.oils_rpt_folder_window.completed_items;</b></span>
 					</div>
 				</td>
 			</tr>
@@ -91,55 +91,41 @@
 	</table>
 
 	<div id='oils_rpt_move_folder_div' class='hide_me' style='width:100%; padding: 5px; margin-left: 10px;'>
-		<div>Selected Folder: <b id='oils_rpt_move_folder_selected'/></div>
+		<div>&reports.oils_rpt_folder_window.selected_folder;<b id='oils_rpt_move_folder_selected'/></div>
 		<hr/>
 		<div id='oils_rpt_move_folder_picker'/>
 		<hr/>
-		<input type='submit' value='Select Folder' id='oils_rpt_change_folder_submit'/>
-		<input type='submit' value='Cancel' id='oils_rpt_change_folder_cancel'/>
+		<input type='submit' value='&reports.oils_rpt_folder_window.select_folder;' id='oils_rpt_change_folder_submit'/>
+		<input type='submit' value='&reports.oils_rpt_folder_window.cancel;' id='oils_rpt_change_folder_cancel'/>
 	</div>
 
 	<span class='hide_me' id='oils_rpt_folder_contents_confirm_delete'>
-		Are you sure you wish to delete the selected item(s)?
+		&reports.oils_rpt_folder_window.confirm_delete;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_folder_contents_template_no_delete'>
-		One or more of the selected templates could not be deleted because 
-		there are reports that depend on them.
+		&reports.oils_rpt_folder_window.dependant_reports_no_delete;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_folder_contents_report_no_delete'>
-		One or more of The selected reports could not be deleted because 
-		there are outputs that depend on them.
+		&reports.oils_rpt_folder_window.dependant_outputs_no_delete;
 	</span>
 
 
 	<span class='hide_me' id='oils_rpt_folder_contents_no_delete'>
-		You may not delete another user's items
+		&reports.oils_rpt_folder_window.cannot_delete_another_users_data;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_change_folder_not_allowed'>
-		You may not move another user's items
+		&reports.oils_rpt_folder_window.cannot_move_another_users_data;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_verify_template_delete'>
-        This will also delete all of your attached reports and outputs for
-        this template.  
-
-        If other users have reports or outputs attached to this template,
-        those will be left untouched and the template will not be deleted.
-        
-        Do you wish continue?
+		&reports.oils_rpt_folder_window.delete_all_attached_reports;
 	</span>
 
 	<span class='hide_me' id='oils_rpt_verify_report_delete'>
-        This will also delete all of your attached outputs for
-        this report.  
-        
-        If other users have outputs attached to this report,
-        those will be left untouched and the report will not be deleted.
-        
-        Do you wish continue?
+		&reports.oils_rpt_folder_window.delete_all_attached_outputs;
 	</span>
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
index 0cc3831e29..9cbeb5be36 100644
--- a/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_param_editor.xhtml
@@ -56,10 +56,10 @@
 				<!--
 				<td>Object</td>
 				-->
-				<td>Column</td>
-				<td>Transform</td>
-				<td>Action</td>
-				<td>User Params</td>
+				<td>&reports.oils_rpt_param_editor.column;</td>
+				<td>&reports.oils_rpt_param_editor.transform;</td>
+				<td>&reports.oils_rpt_param_editor.action;</td>
+				<td>&reports.oils_rpt_param_editor.user_params;</td>
 			</tr>
 		</thead>
 		<tbody id='oils_rpt_param_editor_tbody'>
@@ -76,8 +76,8 @@
 						<span name='widget'/>
 					</div>
 					<div name='reldate_div'  style='margin-top: 5px;' class='hide_me'>
-						<div><b> - OR - </b></div>
-						<input type='checkbox' name='choose_rel'/> Use a relative date instead.
+						<div><b> - &reports.oils_rpt_param_editor.or; - </b></div>
+						<input type='checkbox' name='choose_rel'/> &reports.oils_rpt_param_editor.use_relative_date;
 						<div name='reldate'/>
 					</div>
 				</td>
@@ -117,11 +117,11 @@
 							<option value='24'>24</option>
 						</select>
 						<select name="type">
-							<option value="days">Day(s)</option>
-							<option value="weeks">Week(s)</option>
-							<option value="months">Month(s)</option>
+							<option value="days">&reports.oils_rpt_param_editor.days;</option>
+							<option value="weeks">&reports.oils_rpt_param_editor.weeks;</option>
+							<option value="months">&reports.oils_rpt_param_editor.months;</option>
 						</select>
-						<span> ago</span>
+						<span>&reports.oils_rpt_param_editor.ago;</span>
 					</td>
 				</tr>
 			</tbody>
diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul
index 6d71e308ff..e91555b26f 100644
--- a/Open-ILS/web/reports/xul/template_builder.xul
+++ b/Open-ILS/web/reports/xul/template_builder.xul
@@ -4,6 +4,13 @@
 <?xml-stylesheet href="/opac/common/js/jscalendar/calendar-brown.css" type="text/css" ?>
 <?xml-stylesheet href='/js/dojo/dojo/resources/dojo.css' type='text/css'?>
 
+<!DOCTYPE html PUBLIC 
+	"-//W3C//DTD XHTML 1.0 Transitional//EN" 
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+	<!ENTITY nbsp " ">
+	<!--#include virtual="/opac/locale/${locale}/reports.dtd"-->
+]>
+
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml">
 
 <!-- Load dojo -->
@@ -57,11 +64,11 @@
 <script type="application/x-javascript; e4x=1" src="/opac/common/js/jscalendar/calendar-setup.js"/>
 
 <groupbox flex="1">
-	<caption label="Database Source Browser"/>
+	<caption label="&reports.xul.template_builder.db_source_browser.label;"/>
 	<hbox flex="1">
 		<hbox flex="1">
 			<vbox flex="1">
-				<menulist label="Sources" popup="source-menu"/>
+				<menulist label="&reports.xul.template_builder.sources_menulist.label;" popup="source-menu"/>
 				<tree
 					id="idl-browse-tree"
 					flex="2"
@@ -69,7 +76,7 @@
 					ondblclick="sourceTreeHandlerDblClick(event)"
 				>
 					<treecols>
-						<treecol primary="true" label="Source Name" flex="1"/>
+						<treecol primary="true" label="&reports.xul.template_builder.source_name.label;" flex="1"/>
 					</treecols>
 					<treechildren id="sources-treetop" alternatingbackground="true" />
 				</tree>
@@ -81,7 +88,7 @@
 		<hbox flex="2">
 			<vbox flex="1">
 				<hbox>
-					<label control="path-label" value="Source Specifier:"/>
+					<label control="path-label" value="&reports.xul.template_builder.source_specifier.label;"/>
 					<textbox id="path-label" flex="1"/>
 				</hbox>
 				<hbox flex="1">
@@ -95,8 +102,8 @@
 								enableColumnDrag="true"
 							>
 								<treecols>
-									<treecol label="Field Name" flex="1"/>
-									<treecol label="Data Type" flex="0"/>
+									<treecol label="&reports.xul.template_builder.field_name.label;" flex="1"/>
+									<treecol label="&reports.xul.template_builder.data_type.label;" flex="0"/>
 								</treecols>
 								<treechildren id="class-treetop" alternatingbackground="true" />
 							</tree>
@@ -116,10 +123,10 @@
 								enableColumnDrag="true"
 							>
 								<treecols>
-									<treecol label="Field Transform" flex="1"/>
-									<treecol label="Params" flex="0" hidden="true"/>
-									<treecol label="Applicable Datatypes" flex="1" hidden="true"/>
-									<treecol label="Output Type" flex="1" />
+									<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+									<treecol label="&reports.xul.template_builder.params.label;" flex="0" hidden="true"/>
+									<treecol label="&reports.xul.template_builder.applicable_datatypes.label;" flex="1" hidden="true"/>
+									<treecol label="&reports.xul.template_builder.output_type.label;" flex="1" />
 								</treecols>
 								<treechildren id="trans-treetop" alternatingbackground="true" />
 							</tree>
@@ -139,21 +146,21 @@
 
 
 <groupbox flex="1" orient="horizontal">
-	<caption label="Template Configuration"/>
+	<caption label="&reports.xul.template_builder.template_config_caption.label;"/>
 
 	<hbox flex="1">
 		<vbox flex="1">
 			<hbox>
 			<vbox>
-				<label control="template-name" value="Name:" style="height:2em"/>
-				<label control="template-description" value="Description:"/>
+				<label control="template-name" value="&reports.xul.template_builder.name.label;" style="height:2em"/>
+				<label control="template-description" value="&reports.xul.template_builder.description.label;"/>
 			</vbox>
 			<vbox flex="1">
 				<textbox id="template-name" flex="1"/>
 				<textbox id="template-description" multiline="true" flex="1" style="max-height:3em"/>
 			</vbox>
 			<vbox pack="end">
-				<button onclick="save_template();" label="Save"/>
+				<button onclick="save_template();" label="&reports.xul.template_builder.save.label;"/>
 			</vbox>
 			</hbox>
 
@@ -162,17 +169,17 @@
 					<tabs>
 						<tab
 							id="dis_tab"
-							label="Displayed Fields"
+							label="&reports.xul.template_builder.displayed_fields.label;"
 							onclick="transformSelectHandler(true);"
 						/>
 						<tab
 							id="filter_tab"
-							label="Base Filters"
+							label="&reports.xul.template_builder.base_filters.label;"
 							onclick="transformSelectHandler(true);"
 						/>
 						<tab
 							id="aggfilter_tab"
-							label="Aggregate Filters"
+							label="&reports.xul.template_builder.aggregate_filters.label;"
 							disabled="true"
 							onclick="transformSelectHandler(true);"
 						/>
@@ -198,25 +205,25 @@
 										enableColumnDrag="true"
 									>
 										<treecols>
-											<treecol label="Display Name" flex="3"/>
-											<treecol label="Field Name" hidden="true" flex="1"/>
-											<treecol label="Data Type" flex="1"/>
-											<treecol label="Field Transform" flex="1"/>
-											<treecol label="Field Transform Type" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.display_name.label;" flex="3"/>
+											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.data_type.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
 										</treecols>
 										<treechildren id="dis-col-treetop" alternatingbackground="true" />
 									</tree>
 								</hbox>
 								<hbox pack="center">
-									<button label="Alter Display Header" oncommand="alterColumnLabel()"/>
-									<button type="menu" label="Change Transform">
+									<button label="&reports.xul.template_builder.alter_display_header.label;" oncommand="alterColumnLabel()"/>
+									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
 										<menupopup id='dis_tab_trans_menu'/>
 									</button>
 									<spacer flex="1"/>
-									<button label="Move Up" oncommand="changeDisplayOrder('u')"/>
-									<button label="Move Down" oncommand="changeDisplayOrder('d')"/>
+									<button label="&reports.xul.template_builder.move_up.label;" oncommand="changeDisplayOrder('u')"/>
+									<button label="&reports.xul.template_builder.move_down.label;" oncommand="changeDisplayOrder('d')"/>
 									<spacer flex="1"/>
-									<button label="Remove Selected Field" oncommand="removeReportAtom()"/>
+									<button label="&reports.xul.template_builder.remove_selected_field.label;" oncommand="removeReportAtom()"/>
 								</hbox>
 							</vbox>
 						</tabpanel>
@@ -232,28 +239,28 @@
 										enableColumnDrag="true"
 									>
 										<treecols>
-											<treecol label="Filter Field" flex="2"/>
-											<treecol label="Field Name" hidden="true" flex="1"/>
-											<treecol label="Data Type" hidden="true" flex="1"/>
-											<treecol label="Field Transform" flex="1"/>
-											<treecol label="Field Transform Type" hidden="true" flex="1"/>
-											<treecol label="Operator" flex="1"/>
-											<treecol label="Value" flex="1"/>
+											<treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
+											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
 										</treecols>
 										<treechildren id="filter-col-treetop" alternatingbackground="true" />
 									</tree>
 								</hbox>
 								<hbox pack="center">
-									<button type="menu" label="Change Transform">
+									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
 										<menupopup id='filter_tab_trans_menu'/>
 									</button>
-									<button type="menu" label="Change Operator">
+									<button type="menu" label="&reports.xul.template_builder.change_operator.label;">
 										<menupopup id='filter_tab_op_menu'/>
 									</button>
-									<button label="Change value" command="filter_tab_value_action"/>
-									<button label="Remove value" oncommand="removeTemplateFilterValue()"/>
+									<button label="&reports.xul.template_builder.change_value.label;" command="filter_tab_value_action"/>
+									<button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
 									<spacer flex="1"/>
-									<button label="Remove Selected Fields" oncommand="removeReportAtom()"/>
+									<button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
 								</hbox>
 							</vbox>
 						</tabpanel>
@@ -269,28 +276,28 @@
 										enableColumnDrag="true"
 									>
 										<treecols>
-											<treecol label="Filter Field" flex="2"/>
-											<treecol label="Field Name" hidden="true" flex="1"/>
-											<treecol label="Data Type" hidden="true" flex="1"/>
-											<treecol label="Field Transform" flex="1"/>
-											<treecol label="Field Transform Type" hidden="true" flex="1"/>
-											<treecol label="Operator" flex="1"/>
-											<treecol label="Value" flex="1"/>
+											<treecol label="&reports.xul.template_builder.filter_field.label;" flex="2"/>
+											<treecol label="&reports.xul.template_builder.field_name.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.data_type.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.field_transform_type.label;" hidden="true" flex="1"/>
+											<treecol label="&reports.xul.template_builder.operator.label;" flex="1"/>
+											<treecol label="&reports.xul.template_builder.value.label;" flex="1"/>
 										</treecols>
 										<treechildren id="aggfilter-col-treetop" alternatingbackground="true" />
 									</tree>
 								</hbox>
 								<hbox pack="center">
-									<button type="menu" label="Change Transform">
+									<button type="menu" label="&reports.xul.template_builder.change_transform.label;">
 										<menupopup id='aggfilter_tab_trans_menu'/>
 									</button>
-									<button type="menu" label="Change Operator">
+									<button type="menu" label="&reports.xul.template_builder.change_operator.label;">
 										<menupopup id='aggfilter_tab_op_menu'/>
 									</button>
-									<button label="Change value" command="aggfilter_tab_value_action"/>
-									<button label="Remove value" oncommand="removeTemplateFilterValue()"/>
+									<button label="&reports.xul.template_builder.change_value.label;" command="aggfilter_tab_value_action"/>
+									<button label="&reports.xul.template_builder.remove_value.label;" oncommand="removeTemplateFilterValue()"/>
 									<spacer flex="1"/>
-									<button label="Remove Selected Fields" oncommand="removeReportAtom()"/>
+									<button label="&reports.xul.template_builder.remove_selected_fields.label;" oncommand="removeReportAtom()"/>
 								</hbox>
 							</vbox>
 						</tabpanel>
@@ -311,10 +318,10 @@
 			enableColumnDrag="true"
 		>
 			<treecols>
-				<treecol label="Source Specifier" flex="2"/>
-				<treecol label="Table Name" flex="1" hidden="true"/>
-				<treecol label="SQL Alias" flex="1" hidden="true"/>
-				<treecol label="Relationship" flex="1" hidden="true"/>
+				<treecol label="&reports.xul.template_builder.source_specifier.label;" flex="2"/>
+				<treecol label="&reports.xul.template_builder.table_name.label;" flex="1" hidden="true"/>
+				<treecol label="&reports.xul.template_builder.sql_alias.label;" flex="1" hidden="true"/>
+				<treecol label="&reports.xul.template_builder.relationship.label;" flex="1" hidden="true"/>
 			</treecols>
 			<treechildren id="used-sources-treetop" alternatingbackground="true" />
 		</tree>
-- 
2.11.0