Index: openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	25 Mar 2004 16:14:19 -0000	1.1
+++ openacs-4/packages/bug-tracker/catalog/bug-tracker.en_US.ISO-8859-1.xml	29 Mar 2004 15:07:33 -0000	1.2
@@ -1,9 +1,255 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="bug-tracker" package_version="1.3d3" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Accepted">Accepted</msg>
+  <msg key="action_open">Open</msg>
+  <msg key="Actual">freeze</msg>
+  <msg key="Actual_1">release</msg>
+  <msg key="Actual_2">release date</msg>
+  <msg key="Add">%component_name%</msg>
+  <msg key="Add_1">User</msg>
+  <msg key="Add_2">Version</msg>
+  <msg key="Add_3">resolution code to log title</msg>
+  <msg key="Add_category">Add category</msg>
+  <msg key="Add_new_version">Add new version</msg>
+  <msg key="Admin">Admin</msg>
+  <msg key="Administration">Administration</msg>
+  <msg key="All">All</msg>
+  <msg key="all">all</msg>
+  <msg key="All_1">%Components_name%</msg>
+  <msg key="All_2">%bugs_name% you're assigned to</msg>
+  <msg key="All_3">%bugs_name% you're participating in</msg>
+  <msg key="All_4">%bugs_name%  in this project</msg>
+  <msg key="Already_released_versions">Already Released Versions</msg>
+  <msg key="Anticipated">freeze</msg>
+  <msg key="Anticipated_1">release</msg>
+  <msg key="Anticipated_2">release date</msg>
+  <msg key="Applied">to Version</msg>
+  <msg key="Apply">To</msg>
+  <msg key="Apply_1">to version</msg>
+  <msg key="Apply_2">to Version</msg>
+  <msg key="Assign">Assign</msg>
+  <msg key="Before_getting_started">Before you can get started using the bug-tracker, you need to create at least one component.</msg>
   <msg key="bug">bug</msg>
+  <msg key="Bug-tracker">component maintainer</msg>
+  <msg key="Bug-tracker_1">project maintainer</msg>
+  <msg key="Bug-tracker_2">bug info</msg>
+  <msg key="Bug_Bug_cat">*Bug</msg>
+  <msg key="Bug_Number">Bug Number</msg>
+  <msg key="Bug_status_open_filter">Bug status: [ %open_filter;noquote% ]</msg>
+  <msg key="Bug_Sug_Cat">Suggestion</msg>
+  <msg key="Bug_Type">Bug Type</msg>
+  <msg key="Bugs">of any Status</msg>
   <msg key="bugs">bugs</msg>
+  <msg key="By_Design">By Design</msg>
+  <msg key="Capture">resolution code in the case activity log</msg>
+  <msg key="Categories">Categories</msg>
+  <msg key="Category">Category</msg>
+  <msg key="Category_Type">Category Type</msg>
+  <msg key="Choose">setup</msg>
+  <msg key="Choose_1">Bugs for this Patch</msg>
+  <msg key="Choose_setup">Choose setup</msg>
+  <msg key="Close">Close</msg>
+  <msg key="Closed">Closed</msg>
+  <msg key="Comment">Comment</msg>
+  <msg key="Commented">Commented</msg>
+  <msg key="Component">Component</msg>
   <msg key="component">component</msg>
+  <msg key="Component_id_not_found">Component_id %component_id% not found</msg>
   <msg key="components">components</msg>
+  <msg key="Components_component_filter">Components: %component_filter;noquote%</msg>
+  <msg key="Could_not_find">could  not be found</msg>
+  <msg key="Create_new">Create new</msg>
+  <msg key="Create_new_category_type">Create new category type</msg>
+  <msg key="Creation_Date">Creation Date</msg>
+  <msg key="current">(current)</msg>
+  <msg key="Current_version_1">| Current: %current_version_name%</msg>
+  <msg key="Current_version_2">Current version: %current_version_name%</msg>
+  <msg key="Default">Default</msg>
+  <msg key="Delete">Delete</msg>
+  <msg key="Deleted">Deleted</msg>
+  <msg key="Description">Description</msg>
+  <msg key="Description_1">format</msg>
+  <msg key="Download_patch_content">Download patch content</msg>
+  <msg key="Duplicate">Duplicate</msg>
+  <msg key="Edit">Edit</msg>
+  <msg key="Edit_1">%component_name%</msg>
+  <msg key="Edit_2">Project</msg>
+  <msg key="Edit_3">Project Maintainer</msg>
+  <msg key="Edit_4">Version</msg>
+  <msg key="Edited">Edited</msg>
+  <msg key="Email">Email:</msg>
+  <msg key="Filtered">Filtered %bug_name% list</msg>
+  <msg key="Fix">for version</msg>
+  <msg key="Fix_1">for</msg>
+  <msg key="Fix_2">for Bugs</msg>
+  <msg key="Fix_for_Version">Fix  for Version</msg>
+  <msg key="Fixed">Fixed</msg>
+  <msg key="Fixed_1">in version</msg>
+  <msg key="Fixed_2">Fixed by &lt;a href=\&quot;patch?patch_number=%patch_number%\&quot;&gt;patch \#%patch_number%&lt;/a&gt;</msg>
+  <msg key="Fixed_in_Version">Fixed in Version</msg>
+  <msg key="Found">in version</msg>
+  <msg key="Found_in_Version">Found in Version</msg>
+  <msg key="function">%function% $object_type_name</msg>
+  <msg key="Future_Versions">Future Versions</msg>
+  <msg key="Generated">from Version</msg>
+  <msg key="hide_user_agent">hide user agent</msg>
+  <msg key="How_to_submit_a_patch">How to submit a patch</msg>
+  <msg key="In_Development">In Development</msg>
+  <msg key="Initial">Setup</msg>
+  <msg key="Initial_project_config">Initial project configuration</msg>
+  <msg key="Initial_Setup">&lt;p&gt;
+  Choose your project's initial configuration.
+&lt;/p&gt;
+
+&lt;p&gt;
+  There's nothing that we do here that you can't redo later, if you want to.
+&lt;/p&gt;</msg>
+  <msg key="List">List</msg>
+  <msg key="lt_Default_Category_Setu">Default Category Setup</msg>
+  <msg key="Maintainer">Maintainer:</msg>
+  <msg key="Maintainer_1">Maintainer</msg>
+  <msg key="Manage_Categories">Manage Categories</msg>
+  <msg key="Manage_your_notification">Manage your notifications</msg>
+  <msg key="Map">to %bugs_name%</msg>
+  <msg key="Mapping">Patch #%patch_number% \&quot;%patch_summary%\&quot; to a Bug</msg>
+  <msg key="Name_in_shortcut_URL">Name in shortcut URL</msg>
+  <msg key="Need_Info">Need_Info</msg>
+  <msg key="New">New</msg>
+  <msg key="New_1">New %Bug_name%</msg>
+  <msg key="New_2">Patch</msg>
+  <msg key="No_Bugs">No %bugs_name%</msg>
+  <msg key="No_categories_of_this_type">No categories of this type.</msg>
+  <msg key="No_components">No components</msg>
+  <msg key="No_Maintainer">No Maintainer</msg>
+  <msg key="No_of_All">%next_bug_num% of %all_bugs%</msg>
+  <msg key="No_patches">No %patches_name%.</msg>
+  <msg key="No_Permission_to_do_action">You don't have permission to '%action.pretty_name%' on bug #%bug_id% (\&quot;%bug.summary%\&quot;).</msg>
+  <msg key="No_user_in_database">Couldn't find user in database</msg>
+  <msg key="None">None</msg>
+  <msg key="Not_logged_in">You're not logged in. For more options, &lt;a href=&quot;%login_url%&quot;&gt;log in now&lt;/a&gt;.</msg>
+  <msg key="Not_Reproducable">Not Reproducable</msg>
+  <msg key="Notification">tag</msg>
   <msg key="Notifications">Notifications</msg>
+  <msg key="Notifications_for">Notifications for</msg>
+  <msg key="Number">No of %pretty_names.bugs%</msg>
+  <msg key="number_symbol">#</msg>
+  <msg key="Only">%Component_name% \&quot;%component_name%\&quot;</msg>
+  <msg key="Only_1">%Component_name% \&quot;%component_name%\&quot;</msg>
+  <msg key="Only_2">Open Bugs</msg>
+  <msg key="Open">Open</msg>
+  <msg key="open">open</msg>
+  <msg key="Opened">Opened</msg>
+  <msg key="Page_with_pagination">Page with  [ %pagination_filter% ] &amp;nbsp; &amp;nbsp; Show</msg>
+  <msg key="Parameters">Parameters</msg>
+  <msg key="Patch">file</msg>
+  <msg key="Patch_1">\#</msg>
+  <msg key="Patch_2">file (leave blank to keep current file):</msg>
+  <msg key="Patch_3">\#%patch_number%</msg>
+  <msg key="Patch_4">\# %patch_number%: %patch.summary%</msg>
+  <msg key="Permission">Denied</msg>
+  <msg key="Permission_Denied">Permission Denied</msg>
+  <msg key="Permissions">Permissions</msg>
+  <msg key="Planned_Freeze">Planned Freeze</msg>
+  <msg key="Planned_Release">Planned Release</msg>
+  <msg key="Please_contact_admin">Please contact a project administrator to get the components set up.</msg>
+  <msg key="Please_visit_admin_page">Please visit the &lt;a href=&quot;admin/&quot;&gt;project administration&lt;/a&gt; pages to define software components.</msg>
+  <msg key="Postponed">Postponed</msg>
+  <msg key="Prefs">Pref</msg>
+  <msg key="pretty_plural_per_page">%pretty_plural% per page</msg>
+  <msg key="Prio_High_Cat">1 - High</msg>
+  <msg key="Prio_Low_Cat">3 - Low</msg>
+  <msg key="Prio_Norm_Cat">*2 - Normal</msg>
+  <msg key="Priority">Priority</msg>
+  <msg key="Priority_codes">Priority codes</msg>
+  <msg key="Project">Name</msg>
+  <msg key="Project_administration">Project administration</msg>
+  <msg key="Reassign">Reassign</msg>
+  <msg key="Refused">Refused</msg>
+  <msg key="Release">Release</msg>
+  <msg key="Release_1">Version</msg>
+  <msg key="Release_this_version">Release this version</msg>
+  <msg key="Reopened">Reopened</msg>
+  <msg key="request_notification_for_bug">Request notifications for all activity on this %bug_name%</msg>
+  <msg key="Resolution">Resolution</msg>
+  <msg key="resolution">resolution</msg>
+  <msg key="Resolve">Resolve</msg>
+  <msg key="Resolve_1">Bugs</msg>
+  <msg key="Resolved">Resolved</msg>
+  <msg key="Resolver">Resolver</msg>
+  <msg key="Return">Return</msg>
+  <msg key="Search">Search...</msg>
+  <msg key="Select_one_or_more_of">Select one or more of the following %pretty_names.bugs% for patch &quot;%patch_summary%&quot; (you may select more %pretty_names.bugs% later):</msg>
+  <msg key="set">set</msg>
+  <msg key="Set_to_current">Set to current</msg>
+  <msg key="Sev_Critical_Cat">1 - Critical</msg>
+  <msg key="Sev_Major_Cat">2 - Major</msg>
+  <msg key="Sev_Minor_Cat">4 - Minor</msg>
+  <msg key="Sev_Normal_Cat">*3 - Normal</msg>
+  <msg key="Severity">Severity</msg>
+  <msg key="Severity_Codes">Severity codes</msg>
+  <msg key="show_all">show all</msg>
+  <msg key="show_only_open">show only open</msg>
+  <msg key="show_user_agent">user agent</msg>
+  <msg key="Sort_Order_Note">&lt;b&gt;Note:&lt;/b&gt; Categories are sorted by their
+names. Therefore, it's a good idea to use names of ths form &amp;quot;1 -
+High&amp;quot;, &amp;quot;2 - Normal&amp;quot;, etc., or &amp;quot;A - Critical&amp;quot;,
+&amp;quot;B - Major&amp;quot;, etc., thus making the order obvious.</msg>
+  <msg key="State">State</msg>
+  <msg key="state_open">Open</msg>
+  <msg key="Status">Status</msg>
+  <msg key="stop_watching_bug">Stop watching this %bug_name%</msg>
+  <msg key="Submit_a_new_bug">Submit a new %pretty_names.bug%</msg>
+  <msg key="Submitted">by</msg>
+  <msg key="Submitter">Submitter</msg>
+  <msg key="Subscribe">Subscribe</msg>
+  <msg key="Subscribe_1">to %pretty_name%</msg>
+  <msg key="Summary">Summary</msg>
+  <msg key="Support_Center">Support-Center</msg>
+  <msg key="Support_Problem">Problem</msg>
+  <msg key="Support_Question">*Question</msg>
+  <msg key="Support_Suggestion">Suggestion</msg>
+  <msg key="Support_Type">Support Type</msg>
+  <msg key="Supported">platforms</msg>
+  <msg key="There_are_no_open_to_map">There are no open %pretty_names.bugs% to map the patch to. Try changing the component filter above.</msg>
+  <msg key="this_bug">this %bug_name%</msg>
+  <msg key="This_is_a_new_project">This is a new project.</msg>
+  <msg key="This_project_is_empty">This project is empty.</msg>
+  <msg key="Ticket_Sugg_Cat">Suggestion</msg>
+  <msg key="Ticket_Todo_Cat">*Todo</msg>
+  <msg key="Ticket_Tracker">Ticket-Tracker</msg>
+  <msg key="Ticket_Type">Ticket Type</msg>
+  <msg key="Unassigned">Unassigned</msg>
+  <msg key="Undecided">Undecided</msg>
+  <msg key="Unknown">Unknown</msg>
+  <msg key="Unknown_1">type</msg>
+  <msg key="Unknown_flag">bt_conn: unknown flag $flag</msg>
+  <msg key="Unknown_variable">Unknown variable %var%</msg>
+  <msg key="unmap">unmap</msg>
+  <msg key="Unsubscribe">Unsubscribe</msg>
+  <msg key="Unsubscribe_1">from %pretty_name%&quot; &quot;&lt;# Subscribe to %pretty_name%</msg>
+  <msg key="unsubscribe_to_bug">Unsubscribe to notifications for activity on this %bug_name%</msg>
+  <msg key="Upload_Patch">Upload a patch</msg>
+  <msg key="Use_default_setup">Use default setup</msg>
+  <msg key="User_Agent">User Agent</msg>
+  <msg key="Version">Version</msg>
+  <msg key="Version_1">name</msg>
+  <msg key="Version_2">Name</msg>
+  <msg key="Version_id">Version_id $version_id not found</msg>
+  <msg key="Versions">Versions</msg>
+  <msg key="View_the_bug_fo_component">View the %pretty_names.bugs% for this component</msg>
+  <msg key="watch_this_bug">Watch this %bug_name%</msg>
+  <msg key="Wont_Fix">Won't fix</msg>
+  <msg key="Writing_a_good_bug_report">Writing a good bug report</msg>
+  <msg key="You">You can filter by this %component_name% by viisting %filter_url_string%</msg>
+  <msg key="You_1">You do not have permission to map this patch to a bug. Only the submitter of the patch and users with write permission on this Bug Tracker project (package instance) may do so.</msg>
+  <msg key="You_2">You do not have permission to edit this patch. Only the submitter of the patch and users with write permission on the Bug Tracker project (package instance) may do so.</msg>
+  <msg key="You_3">You do not have permission to reopen this refused patch, only users with write permission on the Bug Tracker package instance (project) may do so.</msg>
+  <msg key="You_4">You do not have permission to reopen this deleted patch, only users with write permission on the Bug Tracker package instance (project) and the submitter of the patch may do so.</msg>
+  <msg key="You_5">do not have permission to cancel this patch - only the submitter of the patch may do so. If you are an administrator you can however refuse the patch.</msg>
+  <msg key="You_6">You don't have permission to edit this patch.</msg>
+  <msg key="You_7">You do not have permission to unmap a bug from this patch. Only the submitter of the patch and users with write permission on the Bug Tracker package instance (project) may do so.</msg>
+  <msg key="Your">Your Preferences</msg>
+  <msg key="Your_1">Your version</msg>
+  <msg key="Your_version">Your version:</msg>
 </message_catalog>
Index: openacs-4/packages/bug-tracker/lib/nav-bar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/nav-bar.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/bug-tracker/lib/nav-bar.tcl	25 Mar 2004 16:12:24 -0000	1.11
+++ openacs-4/packages/bug-tracker/lib/nav-bar.tcl	29 Mar 2004 15:07:33 -0000	1.12
@@ -56,7 +56,7 @@
 multirow append links "[bug_tracker::conn Bugs]" [export_vars -base "${url_prefix}." { { f_fix_for_version {[bug_tracker::conn current_version_id]} } }]
 
 if { $create_p } {
-    multirow append links "New [bug_tracker::conn Bug]" "${url_prefix}bug-add"
+    multirow append links "[_ bug-tracker.New] [bug_tracker::conn Bug]" "${url_prefix}bug-add"
 }
 
 if { [ad_conn untrusted_user_id] != 0 } {
@@ -69,21 +69,21 @@
 }
 
 if { $patches_p } {
-    multirow append links "Patches" [export_vars -no_empty -base "[ad_conn package_url]patch-list" { { status open } { apply_to_version {[bug_tracker::conn current_version_id]} } }]
+    multirow append links "[bug_tracker::conn Patches]" [export_vars -no_empty -base "[ad_conn package_url]patch-list" { { status open } { apply_to_version {[bug_tracker::conn current_version_id]} } }]
 
     if { $create_p } {
-        multirow append links "New Patch" "[ad_conn package_url]patch-add"
+        multirow append links "[_ bug-tracker.New] [bug_tracker::conn Patches]" "[ad_conn package_url]patch-add"
     }
 }
 
 multirow append links [_ bug-tracker.Notifications] "[ad_conn package_url]notifications"
 
 if { $versions_p } {
-    multirow append links "Prefs" "[ad_conn package_url]prefs"
+    multirow append links "[_ bug-tracker.Prefs]" "[ad_conn package_url]prefs"
 }
 
 if { $admin_p } {
-    multirow append links "Admin" "[ad_conn package_url]admin/"
+    multirow append links "[_ bug-tracker.Admin]" "[ad_conn package_url]admin/"
 }
 
 set form_action_url "[ad_conn package_url]bug"
Index: openacs-4/packages/bug-tracker/lib/pagination.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/pagination.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/lib/pagination.adp	22 Sep 2003 15:45:10 -0000	1.3
+++ openacs-4/packages/bug-tracker/lib/pagination.adp	29 Mar 2004 15:07:33 -0000	1.4
@@ -3,8 +3,9 @@
 <table>
 <tr>
 <td>
-Page with  [ @pagination_filter@ ] &nbsp; &nbsp; Show <input type="text" name="interval_size" value="@interval_size@" /> @pretty_plural@ per page <input type="submit" value="Go" />
+#bug-tracker.Page_with_pagination# <input type="text" name="interval_size" value="@interval_size@" /> #bug-tracker.pretty_plural_per_page# <input type="submit" value="Go" />
 </td>
 </tr>
 </table>
 </form>
+
Index: openacs-4/packages/bug-tracker/lib/prev-next-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/prev-next-links.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/lib/prev-next-links.tcl	3 May 2002 16:29:59 -0000	1.1
+++ openacs-4/packages/bug-tracker/lib/prev-next-links.tcl	29 Mar 2004 15:07:33 -0000	1.2
@@ -8,7 +8,7 @@
 
 set rownum 0
 
-foreach var { prev_url next_url } pretty { "Prev" "Next" } {
+foreach var { prev_url next_url } pretty { "[_ acs-kernel.common_Prev]" "[_ acs-kernel.common_Next]" } {
     if { [info exists $var] } {
         multirow append links [set $var] $pretty [incr rownum]
     }
Index: openacs-4/packages/bug-tracker/lib/version-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/version-bar.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/lib/version-bar.adp	28 Aug 2003 09:45:29 -0000	1.3
+++ openacs-4/packages/bug-tracker/lib/version-bar.adp	29 Mar 2004 15:07:33 -0000	1.4
@@ -2,19 +2,20 @@
   <div class="bt_navbar" style="clear: right; float: right; padding: 4px; background-color: #41329c; text-align: center;">
 
     <if @user_id@ ne 0>
-      Your version: <a href="@user_version_url@" class="bt_navbar" style="font-size: 100%;">@user_version_name@</a>
+      #bug-tracker.Your_version# <a href="@user_version_url@" class="bt_navbar" style="font-size: 100%;">@user_version_name@</a>
       <if @user_version_id@ ne @current_version_id@>
-        | Current: @current_version_name@
+        #bug-tracker.Current_version_1#
       </if>
       <else>
-        (current)
+        #bug-tracker.current#
       </else>
     </if>
 
     <else>
-      Current version: @current_version_name@
+      #bug-tracker.Current_version_2#
     </else>
 
   </div>
 </if>
 
+
Index: openacs-4/packages/bug-tracker/tcl/bug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/bug-tracker/tcl/bug-procs.tcl	8 Mar 2004 14:01:19 -0000	1.14
+++ openacs-4/packages/bug-tracker/tcl/bug-procs.tcl	29 Mar 2004 15:07:33 -0000	1.15
@@ -1,4 +1,3 @@
-
 ad_library {
 
     Bug Tracker Bug Library
@@ -49,13 +48,12 @@
                      -workflow_short_name [bug_tracker::bug::workflow_short_name]]
     
     # Derived fields
-    set row(bug_number_display) "#$row(bug_number)"
+    set row(bug_number_display) "$row(bug_number)"
     set row(component_name) [bug_tracker::component_get_name -component_id $row(component_id)]
     set row(found_in_version_name) [bug_tracker::version_get_name -version_id $row(found_in_version)]
     set row(fix_for_version_name) [bug_tracker::version_get_name -version_id $row(fix_for_version)]
     set row(fixed_in_version_name) [bug_tracker::version_get_name -version_id $row(fixed_in_version)]
     
-    
     # Get state information
     workflow::case::fsm::get -case_id $case_id -array case -enabled_action_id $enabled_action_id
     set row(pretty_state) $case(pretty_state)
@@ -303,6 +301,8 @@
     # Get the type id
     set type "workflow_case"
     set type_id [notification::type::get_type_id -short_name $type]
+    # get some i18n text
+    set bug_name "[bug_tracker::conn bug]"
 
     # Check if subscribed
     set request_id [notification::request::get_request_id \
@@ -318,13 +318,13 @@
                      -object_id $bug_id \
                      -url $return_url \
                      -user_id $user_id \
-                     -pretty_name "this bug"]
-        set label "Watch this [bug_tracker::conn bug]"
-        set title "Request notifications for all activity on this [bug_tracker::conn bug]"
+                     -pretty_name "[_ bug-tracker.this_bug]"]
+        set label "[_ bug-tracker.watch_this_bug]"
+        set title "[_ bug-tracker.request_notification_for_bug]"
     } else {
         set url [notification::display::unsubscribe_url -request_id $request_id -url $return_url]
-        set label "Stop watching this [bug_tracker::conn bug]"
-        set title "Unsubscribe to notifications for activity on this [bug_tracker::conn bug]"
+        set label "[_ bug-tracker.stop_watching_bug]"
+        set title "[_ bug-tracker.unsubscribe_to_bug]"
     }
     return [list $url $label $title]
 }
@@ -334,7 +334,7 @@
 } {
     set spec {
         bug {
-            pretty_name "Bug"
+            pretty_name "#bug-tracker.Bug#"
             package_key "bug-tracker"
             object_type "bt_bug"
             callbacks { 
@@ -343,13 +343,13 @@
             }
             roles {
                 submitter {
-                    pretty_name "Submitter"
-                    callbacks { 
+                    pretty_name "#bug-tracker.Submitter#"
+		    callbacks { 
                         workflow.Role_DefaultAssignees_CreationUser
                     }
                 }
                 resolver {
-                    pretty_name "Resolver"
+                    pretty_name "#bug-tracker.Resolver#"
                     callbacks {
                         bug-tracker.ComponentMaintainer
                         bug-tracker.ProjectMaintainer
@@ -360,33 +360,33 @@
             }
             states {
                 open {
-                    pretty_name "Open"
+                    pretty_name "#bug-tracker.state_open#"
                     hide_fields { resolution fixed_in_version }
                 }
                 resolved {
-                    pretty_name "Resolved"
+                    pretty_name "#bug-tracker.Resolved#"
                 }
                 closed {
-                    pretty_name "Closed"
+                    pretty_name "#bug-tracker.Closed#"
                 }
             }
             actions {
                 open {
-                    pretty_name "Open"
-                    pretty_past_tense "Opened"
+                    pretty_name "#bug-tracker.action_open#"
+                    pretty_past_tense "#bug-tracker.Opened#"
                     new_state "open"
                     initial_action_p t
                 }
                 comment {
-                    pretty_name "Comment"
-                    pretty_past_tense "Commented"
+                    pretty_name "#bug-tracker.Comment#"
+                    pretty_past_tense "#bug-tracker.Commented#"
                     allowed_roles { submitter resolver }
                     privileges { read write }
                     always_enabled_p t
                 }
                 edit {
-                    pretty_name "Edit"
-                    pretty_past_tense "Edited"
+                    pretty_name "#acs-kernel.common_Edit#"
+                    pretty_past_tense "#bug-tracker.Edited#"
                     allowed_roles { submitter resolver }
                     privileges { write }
                     always_enabled_p t
@@ -401,39 +401,39 @@
                     }
                 }
                 reassign {
-                    pretty_name "Reassign"
-                    pretty_past_tense "Reassigned"
+                    pretty_name "#bug-tracker.Reassign#"
+                    pretty_past_tense "#bug-tracker._Reassigned#"
                     allowed_roles { submitter resolver }
                     privileges { write }
                     enabled_states { resolved }
                     assigned_states { open }
                     edit_fields { role_resolver }
                 }
                 resolve {
-                    pretty_name "Resolve"
-                    pretty_past_tense "Resolved"
-                    assigned_role "resolver"
+                    pretty_name "#bug-tracker.Resolve#"
+                    pretty_past_tense "#bug-tracker.Resolved#"
+                    assigned_role "#bug-tracker.resolver#"
                     enabled_states { resolved }
                     assigned_states { open }
-                    new_state "resolved"
+                    new_state "#bug-tracker.resolved#"
                     privileges { write }
                     edit_fields { resolution fixed_in_version }
                     callbacks { bug-tracker.CaptureResolutionCode }
                 }
                 close {
-                    pretty_name "Close"
-                    pretty_past_tense "Closed"
-                    assigned_role "submitter"
+                    pretty_name "#bug-tracker.Close#"
+                    pretty_past_tense "#bug-tracker.Closed#"
+                    assigned_role "#bug-tracker.submitter#"
                     assigned_states { resolved }
-                    new_state "closed"
+                    new_state "#bug-tracker.closed#"
                     privileges { write }
                 }
                 reopen {
-                    pretty_name "Reopen"
-                    pretty_past_tense "Reopened"
+                    pretty_name "#bug-tracker.Reopen#"
+                    pretty_past_tense "#bug-tracker.Reopened#"
                     allowed_roles { submitter }
                     enabled_states { resolved closed }
-                    new_state "open"
+                    new_state "#bug-tracker.open#"
                     privileges { write }
                 }
             }
@@ -509,7 +509,7 @@
 #####
 
 ad_proc -private bug_tracker::bug::capture_resolution_code::pretty_name {} {
-    return "Capture resolution code in the case activity log"
+    return "[_ bug-tracker.Capture]"
 }
 
 ad_proc -private bug_tracker::bug::capture_resolution_code::do_side_effect {
@@ -520,7 +520,7 @@
 } {
     workflow::case::add_log_data \
         -entry_id $entry_id \
-        -key "resolution" \
+        -key "[_ bug-tracker.resolution]" \
         -value [db_string select_resolution_code {}]
 }
 
@@ -531,7 +531,7 @@
 #####
 
 ad_proc -private bug_tracker::bug::format_log_title::pretty_name {} {
-    return "Add resolution code to log title"
+    return "[_ bug-tracker.Add_3]"
 }
 
 ad_proc -private bug_tracker::bug::format_log_title::format_log_title {
@@ -557,7 +557,7 @@
 #####
 
 ad_proc -private bug_tracker::bug::get_component_maintainer::pretty_name {} {
-    return "Bug-tracker component maintainer"
+    return "[_ bug-tracker.Bug-tracker]"
 }
 
 ad_proc -private bug_tracker::bug::get_component_maintainer::get_assignees {
@@ -575,7 +575,7 @@
 #####
 
 ad_proc -private bug_tracker::bug::get_project_maintainer::pretty_name {} {
-    return "Bug-tracker project maintainer"
+    return "[_ bug-tracker.Bug-tracker_1]"
 }
 
 ad_proc -private bug_tracker::bug::get_project_maintainer::get_assignees {
@@ -593,7 +593,7 @@
 #####
 
 ad_proc -private bug_tracker::bug::notification_info::pretty_name {} {
-    return "Bug-tracker bug info"
+    return "[_ bug-tracker.Bug-tracker_2]"
 }
 
 ad_proc -private bug_tracker::bug::notification_info::get_notification_info {
@@ -608,20 +608,20 @@
 
     set notification_subject_tag [db_string select_notification_tag {} -default {}]
 
-    set one_line "$pretty_names(Bug) #$bug(bug_number): $bug(summary)"
+    set one_line "$pretty_names(Bug) $bug(summary)"
 
     # Build up data structures with the form labels and values
     # (Note, this is something that the metadata system should be able to do for us)
 
     array set label {
-        summary "Summary"
-        status "Status"
-        found_in_version "Found in version"
-        fix_for_version "Fix for version"
-        fixed_in_version "Fixed in version"
+        summary "[_ bug-tracker.Summary]"
+        status "[_ bug-tracker.Status]"
+        found_in_version "[_ bug-tracker.Found]"
+        fix_for_version "[_ bug-tracker.Fix]"
+        fixed_in_version "[_ bug-tracker.Fixed_1]"
     }
 
-    set label(bug_number) "$pretty_names(Bug) #"
+    set label(bug_number) "$pretty_names(Bug) "
     set label(component) "$pretty_names(Component)"
 
     set fields {
@@ -648,9 +648,9 @@
     set value(component)  $bug(component_name)
     set value(summary) $bug(summary)
     set value(status) $bug(pretty_state)
-    set value(found_in_version) [ad_decode $bug(found_in_version_name) "" "Unknown" $bug(found_in_version_name)]
-    set value(fix_for_version) [ad_decode $bug(fix_for_version_name) "" "Undecided" $bug(fix_for_version_name)]
-    set value(fixed_in_version) [ad_decode $bug(fixed_in_version_name) "" "Unknown" $bug(fixed_in_version_name)]
+    set value(found_in_version) [ad_decode $bug(found_in_version_name) "" "[_ bug-tracker.Unknown]" $bug(found_in_version_name)]
+    set value(fix_for_version) [ad_decode $bug(fix_for_version_name) "" "[_ bug-tracker.Undecided]" $bug(fix_for_version_name)]
+    set value(fixed_in_version) [ad_decode $bug(fixed_in_version_name) "" "[_ bug-tracker.Unknown]" $bug(fixed_in_version_name)]
 
     # Remove fields that should be hidden in this state
     foreach field $bug(hide_fields) {
@@ -685,44 +685,44 @@
 
     set elements {
         bug_number {
-            label "[bug_tracker::conn Bug] \#"
-            display_template {\#@bugs.bug_number@}
+            label "[bug_tracker::conn Bug] [_ bug-tracker.number_symbol] "
+            display_template {[_ bug-tracker.number_symbol]@bugs.bug_number@}
             html { align right }
         }
         summary {
-            label "Summary"
+            label "[_ bug-tracker.Summary]"
             link_url_eval {[export_vars -base bug -entire_form -override { bug_number }]}
-            aggregate_label "Number of $pretty_names(bugs)"
-        }
-        comment {
-            label "Details"
+            aggregate_label "[_ bug-tracker.Number]"
+	}
+	comment {
+	    label "[_ bug-tracker.Details]"
             display_col comment_short
             hide_p 1
         }
         state {
-            label "State"
+            label "[_ bug-tracker.State]"
             display_template {@bugs.pretty_state@<if @bugs.resolution@ not nil> (@bugs.resolution_pretty@)</if>}
             aggregate count
         }
         creation_date_pretty {
-            label "Submitted"
+            label "[_ bug-tracker.Submitted]"
         }
         submitter {
-            label "Submitter"
+            label "[_ bug-tracker.Submitter]"
             display_template {<a href="@bugs.submitter_url@">@bugs.submitter_first_names@ @bugs.submitter_last_name@</a>}
             hide_p 1
         }
     }
 
     if { [bug_tracker::versions_p] } {
         lappend elements fix_for_version {
-            label "Fix for"
+            label "[_ bug-tracker.Fix_1]"
             display_col fix_for_version_name
         }
     }
     
     lappend elements component {
-        label "Component"
+        label "[_ bug-tracker.Component]"
         display_col component_name
     }
 
@@ -731,7 +731,7 @@
 
     set filters {
         f_state {
-            label "State"
+            label "[_ bug-tracker.State]"
             values $state_values
             where_clause {cfsm.current_state = :f_state}
             default_value $state_default_value
@@ -746,12 +746,12 @@
             default_direction desc
         }
         summary {
-            label "Summary"
+            label "[_ bug-tracker.Summary]"
             orderby_asc {upper(b.summary) asc, b.summary asc, b.bug_number asc}
             orderby_desc {upper(b.summary) desc, b.summary desc, b.bug_number desc}
         }
         submitter {
-            label "Submitter"
+            label "[_ bug-tracker.Submitter]"
             orderby_asc {upper(submitter.first_names) asc, upper(submitter.last_name) asc, b.bug_number asc}
             orderby_asc {upper(submitter.first_names) desc, upper(submitter.last_name) desc, b.bug_number desc}
         }
@@ -784,11 +784,11 @@
 
     if { [bug_tracker::versions_p] } {
         lappend filters f_fix_for_version {
-            label "Fix for version"
+            label "[_ bug-tracker.Fix]"
             values {[db_list_of_lists select_fix_for_versions {}]}
             where_clause { b.fix_for_version = :f_fix_for_version }
             null_where_clause { b.fix_for_version is null }
-            null_label "Undecided"
+            null_label "[_ bug-tracker.Undecided]"
         }
     }
 
@@ -802,15 +802,15 @@
             [list \
                  label $action(pretty_name) \
                  values $values \
-                 null_label "Unassigned" \
+                 null_label "[_ bug-tracker.Unassigned]" \
                  where_clause [db_map filter_assignee_where_clause] \
                  null_where_clause [db_map filter_assignee_null_where_clause]]
     }
 
     # Stat: By Component
 
     lappend filters f_component {
-        label "Component"
+        label "[_ bug-tracker.Component]"
         values {[db_list_of_lists select_components {}]}
         where_clause {b.component_id = :f_component}
     }
@@ -829,11 +829,11 @@
         -orderby $orderbys \
         -formats {
             table {
-                label "Table"
+                label "[_ bug-tracker.Table]"
                 layout table
             }
             list {
-                label "List"
+                label "[_ bug-tracker.List]"
                 layout list
                 template {
                     <p class="bt">
@@ -878,7 +878,8 @@
 
 ad_proc bug_tracker::bug::get_multirow {} {
     foreach var [bug_tracker::get_export_variables] { 
-        upvar \#[template::adp_level] $var $var
+#JOEL put this back later
+        upvar #[template::adp_level] $var $var
     }
 
     set workflow_id [bug_tracker::bug::get_instance_workflow_id]
Index: openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	25 Mar 2004 16:11:08 -0000	1.26
+++ openacs-4/packages/bug-tracker/tcl/bug-tracker-procs.tcl	29 Mar 2004 15:07:33 -0000	1.27
@@ -71,14 +71,14 @@
                         return {}
                     }
                     default {
-                        error "Unknown variable $var"
+                        error "[_ bug-tracker.Unknown_variable]"
                     }
                 }
             }
         }
 
         default {
-            error "bt_conn: unknown flag $flag"
+            error "[_ bug-tracker.Unknown_flag]"
         }
     }
 }
@@ -268,7 +268,7 @@
             # we call ourselves again, so we'll get the info this time
             return [get_user_prefs_internal $package_id $user_id]
         } else {
-            error "Couldn't find user in database"
+            error "[_ bug-tracker.No_user_in_database]"
         }
     } else {
         return [array get result]
@@ -345,17 +345,17 @@
 }
 
 ad_proc bug_tracker::patch_status_get_options {} {
-    return { { "Open" open } { "Accepted" accepted } { "Refused" refused }  { "Deleted" deleted }}
+    return { { "[_ bug-tracker.Open]" open } { "[_ bug-tracker.Accepted]" accepted } { "[_ bug-tracker.Refused]" refused }  { "[_ bug-tracker.Deleted]" deleted }}
 }
 
 ad_proc bug_tracker::patch_status_pretty {
     status
 } {
     array set status_codes {
-        open      "Open"
-        accepted  "Accepted"
-        refused   "Refused"
-        deleted   "Deleted"
+        open      "[_ bug-tracker.Open]"
+        accepted  "[_ bug-tracker.Accepted]"
+        refused   "[_ bug-tracker.Refused]"
+        deleted   "[_ bug-tracker.Deleted]"
     }
     if { [info exists status_codes($status)] } {
         return $status_codes($status)
@@ -372,22 +372,22 @@
 
 ad_proc bug_tracker::resolution_get_options {} {
     return { 
-        { "Fixed" fixed } { "By Design" bydesign } { "Won't Fix" wontfix } { "Postponed" postponed } 
-        { "Duplicate" duplicate } { "Not Reproducable" norepro } { "Need Info" needinfo } 
+        { "[_ bug-tracker.Fixed]" fixed } { "[_ bug-tracker.By_Design]" bydesign } { "[_ bug-tracker.Wont_Fix]" wontfix } { "[_ bug-tracker.Postponed]" postponed } 
+        { "[_ bug-tracker.Duplicate]" duplicate } { "[_ bug-tracker.Not_Reproducable]" norepro } { "[_ bug-tracker.Need_Info]" needinfo } 
     }
 }
 
 ad_proc bug_tracker::resolution_pretty {
     resolution
 } {
     array set resolution_codes {
-        fixed "Fixed"
-        bydesign "By Design" 
-        wontfix "Won't Fix" 
-        postponed "Postponed"
-        duplicate "Duplicate"
-        norepro "Not Reproducable"
-        needinfo "Need Info"
+        fixed "[_ bug-tracker.Fixed]"
+        bydesign "[_ bug-tracker.By_Design]" 
+        wontfix "[_ bug-tracker.Wont_Fix]" 
+        postponed "[_ bug-tracker.Postponed]"
+        duplicate "[_ bug-tracker.Duplicate]"
+        norepro "[_ bug-tracker.Not_Reproducable]"
+        needinfo "[_ bug-tracker.Need_Info]" 
     }
     if { [info exists resolution_codes($resolution)] } {
         return $resolution_codes($resolution)
@@ -396,10 +396,6 @@
     }
 }
     
-    
-    
-
-
 #####
 #
 # Categories/Keywords
@@ -604,25 +600,22 @@
     Get the package's default configurations for categories and parameters.
 } {
     return {
-        "Bug-Tracker" {
+        "[_ bug-tracker.Bug_Tracker]" {
             categories {
-                "Bug Type" {
-                    "*Bug"
-                    "Suggestion"
-                    "Todo"
+                "[_ bug-tracker.Bug_Type]" {
+                    "[_ bug-tracker.Bug_Bug_cat]"
+                    "[_ bug-tracker.Bug_Sug_Cat]"
                 }
-                "Priority" {
-                    "1 - High"
-                    "*2 - Normal"
-                    "3 - Low"
+                "[_ bug-tracker.Priority]" {
+                    "[_ bug-tracker.Prio_High_Cat]"
+                    "[_ bug-tracker.Prio_Norm_Cat]"
+                    "[_ bug-tracker.Prio_Low_Cat]"
                 }
-                "Severity" {
-                    "1 - Critical"
-                    "2 - Major"
-                    "*3 - Normal"
-                    "4 - Minor"
-                    "5 - Trivial"
-                    "6 - Enhancement"
+		"[_ bug-tracker.Severity]" {
+                    "[_ bug-tracker.Sev_Critical_Cat]"
+                    "[_ bug-tracker.Sev_Major_Cat]"
+                    "[_ bug-tracker.Sev_Normal_Cat]"
+                    "[_ bug-tracker.Sev_Minor_Cat]"
                 }
             }
             parameters {
@@ -634,16 +627,16 @@
                 VersionsP "1"
             }
         }
-        "Ticket-Tracker" {
+        "[_ bug-tracker.Ticket_Tracker]" {
             categories {
-                "Ticket Type" {
-                    "*Todo"
-                    "Suggestion"
+                "[_ bug-tracker.Ticket_Type]" {
+                    "[_ bug-tracker.Ticket_Todo_Cat]"
+                    "[_ bug-tracker.Ticket_Sugg_Cat]"
                 }
-                "Priority" {
-                    "1 - High"
-                    "*2 - Normal"
-                    "3 - Low"
+                "[_ bug-tracker.Priority]" {
+                    "[_ bug-tracker.Prio_High_Cat]"
+                    "[_ bug-tracker.Prio_Norm_Cat]"
+                    "[_ bug-tracker.Prio_Low_Cat]"
                 }
             }
             parameters {
@@ -655,6 +648,16 @@
                 VersionsP "0"
             }
         }
+        "[_ bug-tracker.Support_Center]" {
+	    categories {
+		"[_ bug-tracker.Support_Type]" {
+                 "[_ bug-tracker.Support_Question]"
+                 "[_ bug-tracker.Support_Suggestion]"
+                 "[_ bug-tracker.Support_Problem]"
+
+		}
+	    }
+	}
     }
 }
 
@@ -750,11 +753,11 @@
     set versions_list [util_memoize [list bug_tracker::version_get_options_not_cached $package_id]]
 
     if { $include_unknown_p } {
-        set versions_list [concat { { "Unknown" "" } } $versions_list]
+        set versions_list [concat { { "[_ bug-tracker.Unknown]" "" } } $versions_list]
     } 
     
     if { $include_undecided_p } {
-        set versions_list [concat { { "Undecided" "" } } $versions_list]
+        set versions_list [concat { { "[_ bug-tracker.Undecided]" "" } } $versions_list]
     } 
     
     return $versions_list
@@ -801,7 +804,7 @@
             return $name
         }
     }
-    error "Version_id $version_id not found"
+    error "[_ bug-tracker.Version_id]"
 }
 
 
@@ -822,7 +825,7 @@
     set components_list [util_memoize [list bug_tracker::components_get_options_not_cached $package_id]]
 
     if { $include_unknown_p } {
-        set components_list [concat { { "Unknown" "" } } $components_list]
+        set components_list [concat { { "[_ bug-tracker.Unknown]" "" } } $components_list]
     } 
     
     return $components_list
@@ -855,7 +858,7 @@
             return [lindex $elm 0]
         }
     }
-    error "Component_id $component_id not found"
+    error "[_ bug-tracker.Component_id_not_found]"
 }
 
 ad_proc bug_tracker::component_get_url_name {
@@ -923,13 +926,13 @@
 } {
 
     array set action_codes {
-        open "Opened"
-        edit "Edited"
-        comment "Comment"
-        accept "Accepted"
-        reopen "Reopened"
-        refuse "Refused"
-        delete "Deleted"
+        open "[_ bug-tracker.Opened]"
+        edit "[_ bug-tracker.Edited]"
+        comment "[_ bug-tracker.Comment]"
+        accept "[_ bug-tracker.Accepted]"
+        reopen "[_ bug-tracker.Reopened]"
+        refuse "[_ bug-tracker.Refused]"
+        delete "[_ bug-tracker.Deleted]"
     }
 
     if { [info exists action_codes($action)] } {
@@ -982,8 +985,8 @@
     
     set users_list [db_list_of_lists users $sql]
     
-    set users_list [concat { { "Unassigned" "" } } $users_list]
-    lappend users_list { "Search..." ":search:"}
+    set users_list [concat { { "[_ bug-tracker.Unassigned]" "" } } $users_list]
+    lappend users_list { "[_ bug-tracker.Search]" ":search:"}
     
     return $users_list
 }
@@ -1067,7 +1070,7 @@
 
             set unmap_url "unmap-patch-from-bug?[export_vars -url { patch_number bug_number } ]"
             if { $write_or_submitter_p } {
-                set unmap_link "(<a href=\"$unmap_url\">unmap</a>)"
+                set unmap_link "(<a href=\"$unmap_url\">[_ bug-tracker.unmap]</a>)"
             } else {
                 set unmap_link ""
             }
@@ -1077,7 +1080,8 @@
         if { [llength $bug_link_list] != 0 } {
             set bugs_string [join $bug_link_list "<br>"]
         } else {
-            set bugs_string "No bugs." 
+	    set bugs_name [bug_tracker::conn bugs]
+            set bugs_string "[_ bug-tracker.No_Bugs]" 
         }
 
         return $bugs_string
@@ -1086,7 +1090,7 @@
 
 ad_proc bug_tracker::get_patch_links {
     {-bug_id:required}
-    {-show_patch_status "open"}
+    {-show_patch_status "[_ bug-tracker.open]"}
 } {
     set patch_list [list]
 
@@ -1101,10 +1105,11 @@
 
     db_foreach get_patches_for_bug "" {
         
-        set status_indicator [ad_decode $show_patch_status "all" "($status)" ""]
+        set status_indicator [ad_decode $show_patch_status "[_ bug-tracker.all]" "($status)" ""]
         lappend patch_list "<a href=\"patch?patch_number=$patch_number\" title=\"patch $patch_number\">[ad_quotehtml $summary]</a> $status_indicator"
     } if_no_rows { 
-        set patches_string "No patches." 
+	set patches_name [bug_tracker::conn patches]
+        set patches_string "[_ bug-tracker.No_patches]" 
     }
 
     if { [llength $patch_list] != 0 } {
@@ -1156,9 +1161,9 @@
 
     ns_log notice "bug_tracker::security_violation: $user_id doesn't have permission to '$action(pretty_name)' on bug $bug(summary)"
     ad_return_forbidden \
-            "Permission Denied" \
+            "[_ bug-tracker.Permission_Denied]" \
             "<blockquote>
-    You don't have permission to '$action(pretty_name)' on bug #$bug_id (\"$bug(summary)\").
+    [_ bug-tracker.No_Permission_to_do_action]
     </blockquote>"
     ad_script_abort
 }
Index: openacs-4/packages/bug-tracker/www/bug-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/bug-add.adp	28 Sep 2003 01:28:18 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/bug-add.adp	29 Mar 2004 15:07:34 -0000	1.9
@@ -6,11 +6,12 @@
 <table align="right">
 <tr>
 <td align="right">
-<a href="bug-submission-instructions.html" target="#" class="bt_link">Writing a good bug report</a>
+<a href="bug-submission-instructions.html" target="#" class="bt_link">#bug-tracker.Writing_a_good_bug_report#</a>
 </td>
 </tr>
 </table>
 
 <formtemplate id="bug"></formtemplate>
 
 
+
Index: openacs-4/packages/bug-tracker/www/bug-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/bug-tracker/www/bug-add.tcl	28 Sep 2003 01:28:18 -0000	1.11
+++ openacs-4/packages/bug-tracker/www/bug-add.tcl	29 Mar 2004 15:07:34 -0000	1.12
@@ -21,9 +21,9 @@
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
+set Bug_name [bug_tracker::conn Bug]
+set page_title [_ bug-tracker.New_1]
 
-set page_title "New [bug_tracker::conn Bug]"
-
 set context [list $page_title]
 
 set user_id [ad_conn user_id]
@@ -41,11 +41,11 @@
 	{value {[bug_tracker::conn component_id]}}
     }
     {summary:text 
-	{label "Summary"} 
+	{label "[_ bug-tracker.Summary]"} 
 	{html {size 50}}
     }
     {found_in_version:text(select),optional 
-        {label "Version"}  
+        {label "[_ bug-tracker.Version]"}  
         {options {[bug_tracker::version_get_options -include_unknown]}} 
         {value {[bug_tracker::conn user_version_id]}}
     }
@@ -64,7 +64,7 @@
 
 ad_form -extend -name bug -form {
     {description:richtext(richtext),optional
-        {label "Description"}
+        {label "[_ bug-tracker.Description]"}
         {html {cols 60 rows 13}}
     }
 
Index: openacs-4/packages/bug-tracker/www/bug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.adp,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/bug-tracker/www/bug.adp	25 Mar 2004 22:06:25 -0000	1.14
+++ openacs-4/packages/bug-tracker/www/bug.adp	29 Mar 2004 15:07:34 -0000	1.15
@@ -20,17 +20,17 @@
 
 <if @user_id@ eq 0>
   <p>
-    You're not logged in. For more options, <a href="@login_url@">log in now</a>.
+    #bug-tracker.Not_logged_in#
   </p>
 </if>
 
 <if @enabled_action_id@ nil>
   <div style="font-size: 75%;" align="right">
     <if @user_agent_p@ false>
-      (<a href="@show_user_agent_url@">show user agent</a>)
+      (<a href="@show_user_agent_url@">#bug-tracker.show_user_agent#</a>)
     </if>
     <else>
-      (<a href="@hide_user_agent_url@">hide user agent</a>)
+      (<a href="@hide_user_agent_url@">#bug-tracker.hide_user_agent#</a>)
     </else>
   </div>
 </if>
Index: openacs-4/packages/bug-tracker/www/bug.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/bug-tracker/www/bug.tcl	28 Jan 2004 11:11:59 -0000	1.27
+++ openacs-4/packages/bug-tracker/www/bug.tcl	29 Mar 2004 15:07:34 -0000	1.28
@@ -7,8 +7,8 @@
 } [bug_tracker::get_page_variables {
     bug_number:integer,notnull
     {user_agent_p:boolean 0}
-    {show_patch_status "open"}
-}]
+    {show_patch_status "[_ bug-tracker.open]"}
+%}]
 
 #####
 #
@@ -25,9 +25,9 @@
 set user_id [ad_conn user_id]
 
 permission::require_permission -object_id $package_id -privilege read
+set Bug_name [bug_tracker::conn Bug]
+set page_title "[_ bug-tracker.%Bug_name% %bug_number%]"
 
-set page_title "[bug_tracker::conn Bug] #$bug_number"
-
 set context [list [ad_quotehtml $page_title]]
 
 # Is this project using multiple versions?
@@ -45,7 +45,9 @@
 
 # Get the bug_id
 if { ![db_0or1row permission_info {} -column_array bug] } {
-    ad_return_complaint 1 "Could not find bug \#$bug_number"
+    set Bug_name [bug_tracker::conn Bug]
+    set could_not_be_found [_ bug-tracker.Could_not_find]
+    ad_return_complaint 1 "[_ bug-tracker.%Bug_name% %bug_number% %could_not_be_found%]"
     return
 }
 
@@ -105,14 +107,14 @@
 
 if { [empty_string_p $enabled_action_id] } {
     set patch_label [ad_decode $show_patch_status \
-                         "open" "Open Patches (<a href=\"[string map {+ %20} [export_vars -base [ad_conn url] -entire_form -override { { show_patch_status all } }]]\">show all</a>)" \
-                         "all" "All Patches (<a href=\"[string map {+ %20} [export_vars -base [ad_conn url] -entire_form -override { { show_patch_status open } }]]\">show only open)" \
-                         "Patches"]
+                         "open" "[_ bug-tracker.Open] [bug_tracker::conn Patches] (<a href=\"[string map {+ %20} [export_vars -base [ad_conn url] -entire_form -override { { show_patch_status all } }]]\">[_ bug-tracker.show_all]</a>)" \
+                         "all" "[_ bug-tracker.All] [bug_tracker::conn Patches] (<a href=\"[string map {+ %20} [export_vars -base [ad_conn url] -entire_form -override { { show_patch_status open } }]]\">[_ bug-tracker.show_only_open])" \
+                         "[bug_tracker::conn Patches]"]
 } else {
     set patch_label [ad_decode $show_patch_status \
-                         "open" "Open Patches" \
-                         "all" "All Patches" \
-                         "Patches"]
+                         "open" "[_ bug-tracker.Open] [bug_tracker::conn Patches]" \
+                         "all" "[_ bug-tracker.All] [bug_tracker::conn Patches]" \
+                         "[bug_tracker::conn Patches]"]
 }
 
 ad_form -name bug -cancel_url $return_url -mode display -has_edit 1 -actions $actions -form  {
@@ -126,7 +128,7 @@
 	{mode display}
     }
     {summary:text(text)
-	{label "Summary"}
+	{label "[_ bug-tracker.Summary]"}
 	{before_html "<b>"}
 	{after_html "</b>"}
 	{mode display}
@@ -137,13 +139,13 @@
 
 ad_form -extend -name bug -form {
     {pretty_state:text(inform)
-	{label "Status"}
+	{label "[_ bug-tracker.Status]"}
 	{before_html "<b>"}
 	{after_html  "</b>"}
 	{mode display}
     }
     {resolution:text(select),optional
-	{label "Resolution"}
+	{label "[_ bug-tracker.Resolution]"}
 	{options {[bug_tracker::resolution_get_options]}}
 	{mode display}
     }
@@ -162,7 +164,7 @@
 
 ad_form -extend -name bug -form {
     {found_in_version:text(select),optional
-	{label "Found in Version"}
+	{label "[_ bug-tracker.Found_in_Version]"}
 	{options {[bug_tracker::version_get_options -include_unknown]}}
 	{mode display}
     }
@@ -178,21 +180,21 @@
 	{mode display}
     }
     {user_agent:text(inform)
-	{label "User Agent"}
+	{label "[_ bug-tracker.User_Agent]"}
 	{mode display}
     }
     {fix_for_version:text(select),optional
-	{label "Fix for Version"}
+	{label "[_ bug-tracker.Fix_for_Version]"}
 	{options {[bug_tracker::version_get_options -include_undecided]}}
 	{mode display}
     }
     {fixed_in_version:text(select),optional
-	{label "Fixed in Version"}
+	{label "[_ bug-tracker.Fixed_in_Version]"}
 	{options {[bug_tracker::version_get_options -include_undecided]}}
 	{mode display}
     }
     {description:richtext(richtext),optional
-	{label "Description"} 
+	{label "[_ bug-tracker.Description]"} 
 	{html {cols 60 rows 13}} 
     }
     {return_url:text(hidden) 
@@ -218,7 +220,7 @@
     }
     
     # LARS: Hack! How do we set editing of dynamic fields?
-    if { [string equal [workflow::action::get_element -action_id $action_id -element short_name] "edit"] } {
+    if { [string equal [workflow::action::get_element -action_id $action_id -element short_name] "[_ acs-kernel.common_edit]"] } {
         foreach { category_id category_name } [bug_tracker::category_types] {
             element set_properties bug $category_id -mode edit
         }
@@ -285,7 +287,7 @@
     }
     
     # Display value for patches
-    set bug(patches_display) "[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status] &nbsp; \[ <a href=\"patch-add?[export_vars { { bug_number $bug(bug_number) } { component_id $bug(component_id) } }]\">Upload a patch</a> \]"
+    set bug(patches_display) "[bug_tracker::get_patch_links -bug_id $bug(bug_id) -show_patch_status $show_patch_status] &nbsp; \[ <a href=\"patch-add?[export_vars { { bug_number $bug(bug_number) } { component_id $bug(component_id) } }]\">[_ bug-tracker.Upload_Patch]</a> \]"
 
     # Hide elements that should be hidden depending on the bug status
     foreach element $bug(hide_fields) {
@@ -318,15 +320,15 @@
 
         # check that the element exists
         if { [info exists bug:$element] && [info exists bug($element)] } {
-            if { [form is_request bug] || [string equal [element get_property bug $element mode] "display"] } {
+            if { [form is_request bug] || [string equal [element get_property bug $element mode] "[_ acs-kernel.common_display]" } {
                 element set_value bug $element $bug($element)
             }
         }
     }
     
     # Add empty option to resolution code
     if { ![empty_string_p $enabled_action_id] } {
-        if { [lsearch [workflow::action::get_element -action_id $action_id -element edit_fields] "resolution"] == -1 } {
+        if { [lsearch [workflow::action::get_element -action_id $action_id -element edit_fields] "[_ bug-tracker.resolution]"] == -1 } {
             element set_properties bug resolution -options [concat {{{} {}}} [element get_property bug resolution options]]
         }
     } else {
@@ -357,10 +359,11 @@
     # TODO: Make real
     set filtered_p 1
     if { $filtered_p } {
+        set bug_name [bug_tracker::conn bug]
         set context [list \
                          [list \
                               [export_vars -base . [bug_tracker::get_export_variables]] \
-                              "Filtered [bug_tracker::conn bug] list"] \
+                              "[_ bug-tracker.Filtered]"] \
                          [ad_quotehtml $page_title]]
     } else {
         set context [list [ad_quotehtml $page_title]]
@@ -419,31 +422,33 @@
         
         if { $filter_bug_index != -1 } {
             
+            set next_bug_num [expr $filter_bug_index+1]
+            set all_bugs [llength $filter_bug_numbers]
             multirow append navlinks \
                 $first_url \
                 "/resources/acs-subsite/stock_first-16.png" \
-                "First"
+                "[_ acs-kernel.common_First]"
             
             multirow append navlinks \
                 $prev_url \
                 "/resources/acs-subsite/stock_left-16.png" \
-                "Previous"
+                "[_ acs-kernel.common_Previous]"
             
             multirow append navlinks \
                 {} \
                 {} \
                 {} \
-                "[expr $filter_bug_index+1] of [llength $filter_bug_numbers]"
+                "[_ bug-tracker.No_of_All]"
             
             multirow append navlinks \
                 $next_url \
                 "/resources/acs-subsite/stock_right-16.png" \
-                "Next"
+                "[_ acs-kernel.common_Next]"
 
             multirow append navlinks \
                 $last_url \
                 "/resources/acs-subsite/stock_last-16.png" \
-                Last
+                "[_ acs-kernel.common_Last]"
         }
     }  
 }
Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	22 Sep 2003 15:45:10 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	29 Mar 2004 15:07:34 -0000	1.6
@@ -3,15 +3,15 @@
 <property name="context">@context;noquote@</property>
 
 <if @open_bugs:rowcount@ not eq 0>
-Select one or more of the following @pretty_names.bugs@ for patch "@patch_summary@" (you may select more @pretty_names.bugs@ later):
+#bug-tracker.Select_one_or_more_of#
 </if>
 
 <p>
-Components: @component_filter;noquote@
+#bug-tracker.Components_component_filter#
 </p>
 
 <p>
-Bug status: [ @open_filter;noquote@ ]
+#bug-tracker.Bug_status_open_filter#
 </p>
 
 <p>
@@ -26,9 +26,9 @@
     <if @open_bugs:rowcount@ not eq 0>
       <tr>
         <th>&nbsp;</th>
-        <th>Bug Number</th>
-        <th>Summary</th>
-        <th>Creation Date</th>
+        <th>#bug-tracker.Bug_Number#</th>
+        <th>#bug-tracker.Summary#</th>
+        <th>#bug-tracker.Creation_Date#</th>
       </tr>
     </if>
 
@@ -43,7 +43,7 @@
   </table>
 
    <if @open_bugs:rowcount@ eq 0>
-     <i>There are no open @pretty_names.bugs@ to map the patch to. Try changing the component filter above.</i>
+     <i>#bug-tracker.There_are_no_open_to_map#</i>
 
      <p>
      <center>
@@ -61,3 +61,4 @@
    </else>
 </form>
 </blockquote>
+
Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl	25 Sep 2003 12:13:37 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.tcl	29 Mar 2004 15:07:34 -0000	1.6
@@ -32,7 +32,7 @@
 set user_is_submitter_p [expr $user_id == [bug_tracker::get_patch_submitter -patch_number $patch_number]]
 
 if { ![expr $user_is_submitter_p || $write_p] } {            
-    ad_return_forbidden "Permission Denied" "You do not have permission to map this patch to a bug. Only the submitter of the patch and users with write permission on this Bug Tracker project (package instance) may do so."            
+    ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_1]"            
     ad_script_abort
 }
 
@@ -51,7 +51,7 @@
 }
 
 set patch_summary [db_string get_patch_summary {}]
-set page_title "Mapping Patch #$patch_number \"$patch_summary\" to a Bug"
+set page_title "[_ bug-tracker.Mapping]"
 set context [list "$page_title"]
 
 # Build the component filter
@@ -60,15 +60,19 @@
 }
 set component_where_clause ""
 set component_filter ""
+
+set Component_name [bug_tracker::conn Component]
+set Components_name [bug_tracker::conn Components]
+
 if { ![empty_string_p $component_id] } {
     set component_name [bug_tracker::component_get_name -component_id $component_id]
     set component_filter_url "map-patch-to-bugs?[export_vars -url {patch_number component_id return_url offset show_only_open_p interval_size}]"
     if { $show_all_components_p } {
-        set component_filter "\[ <a href=\"$component_filter_url&show_all_components_p=0\">Only Component \"$component_name\"</a> | All Components \]"
+        set component_filter "\[ <a href=\"$component_filter_url&show_all_components_p=0\">[_ bug-tracker.Only]"</a> | [_ bug-tracker.All_1] \]"
     } else {
         set component_where_clause "\n     and bt_bugs.component_id = :component_id"
     
-        set component_filter "\[ Only Component \"$component_name\" | <a href=\"$component_filter_url&show_all_components_p=1\">All Components</a> \]"
+        set component_filter "\[ [_ bug-tracker.Only_1] | <a href=\"$component_filter_url&show_all_components_p=1\">[_ bug-tracker.All_1]</a> \]"
     }
 }
 
@@ -77,8 +81,8 @@
 set initial_state_id [workflow::fsm::get_initial_state -workflow_id $workflow_id]
 
 set open_filter_url "map-patch-to-bugs?[export_vars -url {patch_number component_id return_url offset show_all_components_p interval_size}]"
-set only_open_label "Only Open Bugs"
-set any_status_label "Bugs of any Status"
+set only_open_label [_ bug-tracker.Only_2]
+set any_status_label [_ bug-tracker.Bugs]
 if { $show_only_open_p } {
     set open_where_clause "and cfsm.current_state = :initial_state_id"
     set open_filter "$only_open_label | <a href=\"$open_filter_url&show_only_open_p=0\">$any_status_label</a>"
Index: openacs-4/packages/bug-tracker/www/no-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-bugs.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/no-bugs.adp	28 Sep 2003 01:28:18 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/no-bugs.adp	29 Mar 2004 15:07:34 -0000	1.8
@@ -3,16 +3,17 @@
 <property name="context">@context;noquote@</property>
 
 <p>
-  <i>This project is empty.</i>
+  <i>#bug-tracker.This_project_is_empty#</i>
 </p>
 
 <if @admin_p@ true>
   <p>
-    <b>&raquo;</b> <a href="admin/">Project administration</a>
+    <b>&raquo;</b> <a href="admin/">#bug-tracker.Project_administration#</a>
   </p>
 </if>
 
 <p>
-  <b>&raquo;</b> <a href="bug-add">Submit a new @pretty_names.bug@</a>
+  <b>&raquo;</b> <a href="bug-add">#bug-tracker.Submit_a_new_bug#</a>
 </p>
 
+
Index: openacs-4/packages/bug-tracker/www/no-components.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-components.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/no-components.adp	28 Sep 2003 01:28:18 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/no-components.adp	29 Mar 2004 15:07:34 -0000	1.7
@@ -2,13 +2,13 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-Before you can get started using the bug-tracker, you need to create at least one component.
+#bug-tracker.Before_getting_started#
 
 <p>
 
 <if @admin_p@>
-  Please visit the <a href="admin/">project administration</a> pages to define software components.
+  #bug-tracker.Please_visit_admin_page#
 </if>
 <else>
-  Please contact a project administrator to get the components set up.
+  #bug-tracker.Please_contact_admin#
 </else>
Index: openacs-4/packages/bug-tracker/www/notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/www/notifications.adp	22 Sep 2003 15:45:10 -0000	1.4
+++ openacs-4/packages/bug-tracker/www/notifications.adp	29 Mar 2004 15:07:34 -0000	1.5
@@ -4,9 +4,9 @@
 
 <table cellspacing="1" cellpadding="3" class="bt_listing">
   <tr class="bt_listing_header">
-    <th colspan="2">Notifications for</th>
-    <th>Subscribe</th>
-    <th>Unsubscribe</th>
+    <th colspan="2">#bug-tracker.Notifications_for#</th>
+    <th>#bug-tracker.Subscribe#</th>
+    <th>#bug-tracker.Unsubscribe#</th>
   </tr>
   <multiple name="notifications">
     <if @notifications.rownum@ odd>
@@ -28,18 +28,19 @@
       </td>
       <td class="bt_listing">
         <if @notifications.subscribed_p@ false>
-          <a href="@notifications.url@" title="@notifications.title@">Subscribe</a>
+          <a href="@notifications.url@" title="@notifications.title@">#bug-tracker.Subscribe#</a>
         </if>
       </td>
       <td class="bt_listing">
         <if @notifications.subscribed_p@ true>
-          <a href="@notifications.url@" title="@notifications.title@">Unsubscribe</a>
+          <a href="@notifications.url@" title="@notifications.title@">#bug-tracker.Unsubscribe#</a>
         </if>
       </td>
     </tr>
   </multiple>
 </table>
 
 <p>
-  <a href="@manage_url@">Manage your notifications</a>
+  <a href="@manage_url@">#bug-tracker.Manage_your_notification#</a>
 </p>
+
Index: openacs-4/packages/bug-tracker/www/notifications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/notifications.tcl	28 Aug 2003 09:45:29 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/notifications.tcl	29 Mar 2004 15:07:34 -0000	1.3
@@ -4,7 +4,7 @@
     bug_number:integer,optional
 }
 
-set page_title "Notifications"
+set page_title [_ bug-tracker.Notifications]
 set context [list $page_title]
 
 set workflow_id [bug_tracker::bug::get_instance_workflow_id]
@@ -25,6 +25,8 @@
 
 multirow create notifications url label title subscribed_p
 
+set bugs_name [bug_tracker::conn bugs]
+
 foreach type { 
     workflow_assignee workflow_my_cases workflow
 } {
@@ -36,16 +38,16 @@
     if { ![empty_string_p $object_id] } {
         switch $type {
             workflow_assignee {
-                set pretty_name "all [bug_tracker::conn bugs] you're assigned to"
+                set pretty_name [_ bug-tracker.All_2]
             }
             workflow_my_cases {
-                set pretty_name "all [bug_tracker::conn bugs] you're participating in"
+                set pretty_name [_ bug-tracker.All_3]
             }
             workflow {
-                set pretty_name "all [bug_tracker::conn bugs] in this project"
+                set pretty_name [_ bug-tracker.All_4]
             }
             default {
-                error "Unknown type"
+                error "[_ bug-tracker.Unknown_1]"
             }
         }
 
@@ -75,7 +77,7 @@
             multirow append notifications \
                 $url \
                 [string totitle $pretty_name] \
-                [ad_decode $subscribed_p 1 "Unsubscribe from $pretty_name" "Subscribe to $pretty_name"] \
+                [ad_decode $subscribed_p 1 "[_ bug-tracker.Unsubscribe_1]" "[_ bug-tracker.Subscribe_1]"] \
                 $subscribed_p
         }
     }
Index: openacs-4/packages/bug-tracker/www/patch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/patch-add.adp	22 Sep 2003 15:45:10 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/patch-add.adp	29 Mar 2004 15:07:34 -0000	1.7
@@ -6,9 +6,10 @@
 <table align="right">
 <tr>
 <td align="right">
-<a href="patch-submission-instructions.html" target="#" class="bt_link">How to submit a patch</a>
+<a href="patch-submission-instructions.html" target="#" class="bt_link">#bug-tracker.How_to_submit_a_patch#</a>
 </td>
 </tr>
 </table>
 
 <formtemplate id="patch"></formtemplate>
+
Index: openacs-4/packages/bug-tracker/www/patch-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/bug-tracker/www/patch-add.tcl	28 Sep 2003 01:28:18 -0000	1.10
+++ openacs-4/packages/bug-tracker/www/patch-add.tcl	29 Mar 2004 15:07:34 -0000	1.11
@@ -30,7 +30,7 @@
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
-set page_title "New Patch"
+set page_title [_ bug-tracker.New_2]
 set context [list $page_title]
 set user_id [ad_conn user_id]
 
@@ -47,38 +47,38 @@
 element create patch component_id \
         -datatype integer \
         -widget select \
-        -label "Component" \
+        -label "[_ bug-tracker.Component]" \
         -options [bug_tracker::components_get_options]
 
 element create patch summary  \
         -datatype text \
-        -label "Summary" \
+        -label "[_ bug-tracker.Summary]" \
         -html { size 50 }
 
 element create patch description  \
         -datatype text \
         -widget textarea \
-        -label "Description" \
+        -label "[_ bug-tracker.Description]" \
         -html { cols 50 rows 10 } \
         -optional
 
 element create patch description_format \
                 -datatype text \
                 -widget select \
-                -label "Description format" \
-                -options { { "Plain" plain } { "HTML" html } { "Preformatted" pre } }
+                -label "[_ bug-tracker.Description_1]" \
+    -options { { "[_ bug-tracker.Plain]" plain } { "[_ bug-tracker.HTML]" html } { "[_ bug-tracker.Preformatted]" pre } }
 
 element create patch version_id \
         -datatype text \
         -widget select \
-        -label "Generated from Version" \
+        -label "[_ bug-tracker.Generated]" \
         -options [bug_tracker::version_get_options -include_unknown] \
         -optional
     
 element create patch patch_file \
         -datatype file \
         -widget file \
-        -label "Patch file" \
+        -label "[_ bug-tracker.Patch]" \
 
 if { [exists_and_not_null bug_number] } {
     # Export the bug number
@@ -93,7 +93,7 @@
     element create patch select_bugs_p \
             -datatype text \
             -widget radio \
-            -label "Choose Bugs for this Patch" \
+            -label "[_ bug-tracker.Choose_1]" \
             -options { {Yes 1} {No 0} } \
             -values { 1 }
 }
Index: openacs-4/packages/bug-tracker/www/patch-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-list.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/patch-list.tcl	28 Sep 2003 01:28:18 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/patch-list.tcl	29 Mar 2004 15:07:34 -0000	1.8
@@ -14,7 +14,10 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-set page_title "Patches" 
+set Patches_name [bug_tracker::conn Patches]
+set Patch_name [bug_tracker::conn Patch]
+
+set page_title "$Patches_name" 
 set context [list $page_title]
 
 # TODO: Use bug_tracker::patch_status_pretty for pretty state (problem with the filter, but it can be done)
@@ -24,46 +27,46 @@
     -multirow patches \
     -elements {
         patch_number {
-            label "Patch \#"
+            label "[bug_tracker::conn Patch]"
             display_template {\#@patches.patch_number@}
             html { align right }
         }
         summary {
-            label "Summary"
+            label "[_ bug-tracker.Summary]"
             link_url_eval {[export_vars -base patch { patch_number }]}
         }
         status {
-            label "Status"
+            label "[_ bug-tracker.Status]"
             display_eval {[string totitle $status]}
         }
         apply_to_version_name {
-            label "Apply To"
+            label "[_ bug-tracker.Apply]"
             display_template {
                 <if @patches.apply_to_version_name@ not nil>@patches.apply_to_version_name@</if>
                 <else><i>Undecided</i></else>
             }
         }
         component_name {
-            label "Component"
+            label "[_ bug-tracker.Component]"
         }
         creation_date_pretty {
-            label "Submitted"
+            label "[_ bug-tracker.Submitted]"
         }
     } -filters {
         status {
-            label "Status"
+            label "[_ bug-tracker.Status]"
             values {[db_list_of_lists select_states {}]}
             where_clause {[db_map states_where_clause]}
         }
         apply_to_version {
-            label "Apply to version"
+            label "[_ bug-tracker.Apply_1]"
             values {[db_list_of_lists select_versions {}]}
             where_clause {[db_map apply_to_version_where_clause]}
             null_where_clause {[db_map apply_to_version_null_where_clause]}
             null_label {Undecided}
         }
         component_id {
-            label "Component"
+            label "[_ bug-tracker.Component]"
             values {[db_list_of_lists select_components {
             }]}
             where_clause {[db_map component_where_clause]}
Index: openacs-4/packages/bug-tracker/www/patch.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/patch.adp	25 Mar 2004 22:06:25 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/patch.adp	29 Mar 2004 15:07:34 -0000	1.7
@@ -21,7 +21,7 @@
 <if @mode@ eq "view" and @deleted_p@ eq 0>
 <center>
 <p>
-<a href="patch?patch_number=@patch_number@&download=1">Download patch content</a>
+<a href="patch?patch_number=@patch_number@&download=1">#bug-tracker.Download_patch_content#</a>
 </p>
 </center>
 <p>
@@ -35,7 +35,7 @@
 </p>
 <center>
 <p>
-<a href="patch?patch_number=@patch_number@&download=1">Download patch content</a>
+<a href="patch?patch_number=@patch_number@&download=1">#bug-tracker.Download_patch_content#</a>
 </p>
 </center>
 </if>
@@ -46,3 +46,4 @@
 
 
 
+
Index: openacs-4/packages/bug-tracker/www/patch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/patch.tcl	27 Mar 2004 13:15:30 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/patch.tcl	29 Mar 2004 15:07:34 -0000	1.9
@@ -57,19 +57,19 @@
 # We are in view mode per default
 if { ![info exists mode] } {
     if { [exists_and_not_null edit] } {
-        set mode "edit"
+        set mode "[_ bug-tracker.edit]"
     } elseif { [exists_and_not_null accept] } {        
-        set mode "accept"
+        set mode "[_ bug-tracker.accept]"
     } elseif { [exists_and_not_null refuse] } {
-        set mode "refuse"
+        set mode "[_ bug-tracker.refuse]"
     } elseif { [exists_and_not_null delete] } {
-        set mode "delete"
+        set mode "[_ bug-tracker.delete]"
     } elseif { [exists_and_not_null reopen] } {
-        set mode "reopen"
+        set mode "[_ bug-tracker.reopen]"
     } elseif { [exists_and_not_null comment] } {
-        set mode "comment"
+        set mode "[_ bug-tracker.comment]"
     } else {
-        set mode "view"
+        set mode "[_ bug-tracker.view]"
     }
 }
 
@@ -78,7 +78,7 @@
 switch -- $mode {
     edit {
         if { ![expr $write_p || $user_is_submitter_p] } {
-            ad_return_forbidden "Permission Denied" "You do not have permission to edit this patch. Only the submitter of the patch and users with write permission on the Bug Tracker project (package instance) may do so."
+            ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_2]"
             ad_script_abort
         }
 
@@ -97,11 +97,11 @@
     }
     reopen {
         # User must have write permission to reopen a refused patch
-        if { [string equal $patch_status "refused"] && !$write_p } {
-            ad_return_forbidden "Permission Denied" "You do not have permission to reopen this refused patch, only users with write permission on the Bug Tracker package instance (project) may do so."
+        if { [string equal $patch_status "[_ bug-tracker.refused]"] && !$write_p } {
+            ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_3]"
             ad_script_abort
-        } elseif { [string equal $patch_status "deleted"] && !($user_is_submitter_p || $write_p)} {
-            ad_return_forbidden "Permission Denied" "You do not have permission to reopen this deleted patch, only users with write permission on the Bug Tracker package instance (project) and the submitter of the patch may do so."
+        } elseif { [string equal $patch_status "[_ bug-tracker.deleted]"] && !($user_is_submitter_p || $write_p)} {
+            ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_4]"
             ad_script_abort            
         } 
 
@@ -110,7 +110,7 @@
     delete {
         # Only the submitter can delete a patch (admins can refuse it)
         if { !$user_is_submitter_p } {
-            ad_return_forbidden "Permission Denied" "You do not have permission to cancel this patch - only the submitter of the patch may do so. If you are an administrator you can however refuse the patch."
+            ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_5]"
             ad_script_abort
         }
         set edit_fields {}
@@ -127,7 +127,7 @@
     set field_editable_p($field) 1
 }
 
-if { ![string equal $mode "view"] } {
+if { ![string equal $mode "[_ bug-tracker.view]"] } {
     ad_maybe_redirect_for_registration
 }    
 
@@ -151,55 +151,55 @@
 element create patch patch_number_i \
         -datatype integer \
         -widget   inform \
-        -label    "Patch #"
+        -label    "[_ bug-tracker.Patch_1]"
 
 element create patch component_id \
         -datatype text \
         -widget [ad_decode [info exists field_editable_p(component_id)] 1 select inform] \
-        -label "Component" \
+        -label "[_ bug-tracker.Component]" \
         -options [bug_tracker::components_get_options]
 
-if { [string equal $mode "view"] } {
+if { [string equal $mode "[_ bug-tracker.view]"] } {
     element create patch fixes_bugs \
         -datatype text \
         -widget inform \
-        -label "Fix for Bugs"
+        -label "[_ bug-tracker.Fix_2]"
 }
 
 element create patch summary  \
         -datatype text \
         -widget [ad_decode [info exists field_editable_p(summary)] 1 text inform] \
-        -label "Summary" \
+        -label "[_ bug-tracker.Summary]" \
         -html { size 50 }
 
 element create patch submitter \
         -datatype text \
         -widget inform \
-        -label "Submitted by"
+        -label "[_ bug-tracker.Submitted]"
 
 element create patch status \
         -widget inform \
         -datatype text \
-        -label "Status"
+        -label "[_ bug-tracker.Status]"
 
 element create patch generated_from_version \
         -datatype text \
         -widget [ad_decode [info exists field_editable_p(generated_from_version)] 1 select inform] \
-        -label "Generated from Version" \
+        -label "[_ bug-tracker.Generated]" \
         -options [bug_tracker::version_get_options -include_unknown] \
         -optional
 
 element create patch apply_to_version \
         -datatype text \
         -widget [ad_decode [info exists field_editable_p(apply_to_version)] 1 select inform] \
-        -label "Apply to Version" \
+        -label "[_ bug-tracker.Apply_2]" \
         -options [bug_tracker::version_get_options -include_undecided] \
         -optional
 
 element create patch applied_to_version \
         -datatype text \
         -widget [ad_decode [info exists field_editable_p(applied_to_version)] 1 select inform] \
-        -label "Applied to Version" \
+        -label "[_ bug-tracker.Applied]" \
         -options [bug_tracker::version_get_options -include_undecided] \
         -optional
 
@@ -208,44 +208,44 @@
         element create patch description  \
                 -datatype text \
                 -widget comment \
-                -label "Description" \
+                -label "[_ bug-tracker.Description]" \
                 -html { cols 60 rows 13 } \
                 -optional
         
         element create patch desc_format \
                 -datatype text \
                 -widget select \
-                -label "Description format" \
-                -options { { "Plain" plain } { "HTML" html } { "Preformatted" pre } }
+                -label "[_ bug-tracker.Description_1]" \
+	    -options { { "[_ bug-tracker.Plain]" plain } { "[_ bug-tracker.HTML]" html } { "[_ bug-tracker.Preformatted]" pre } }
 
     }
     default {
         # View mode
         element create patch description \
                 -datatype text \
                 -widget inform \
-                -label "Description"
+                -label "[_ bug-tracker.Description]"
     }
 }
 
 # In accept mode - give the user the ability to select associated
 # bugs to be resolved
-if { [string equal $mode "accept"] } {
+if { [string equal $mode "[_ bug-tracker.accept]"] } {
 
     element create patch resolve_bugs \
             -datatype integer \
             -widget checkbox \
-            -label "Resolve Bugs" \
+            -label "[_ bug-tracker.Resolve_1]" \
             -options [bug_tracker::get_mapped_bugs -patch_number $patch_number -only_open_p 1] \
             -optional
 }
 
-if { [string equal $mode "edit"] } {
+if { [string equal $mode "[_ bug-tracker.edit]"] } {
     # Edit mode - display the file upload widget for patch content
     element create patch patch_file \
           -datatype file \
           -widget file \
-          -label "Patch file (leave blank to keep current file):" \
+          -label "[_ bug-tracker.Patch_2]" \
           -optional
 } 
 
@@ -254,15 +254,16 @@
         -widget hidden \
         -value $mode
 
-set page_title "Patch #$patch_number"
-set context [list [list "patch-list" "Patches"] $page_title]
+set page_title [_ bug-tracker.Patch_3]
+set Patches_name [bug_tracker::conn Patches]
+set context [list [list "patch-list" "$Patches_name"] $page_title]
 
 if { [form is_request patch] } {
     # The form was requested
 
     db_1row patch {} -column_array patch
-    set patch(generated_from_version_name) [ad_decode $patch(generated_from_version) "" "Unknown" [bug_tracker::version_get_name -version_id $patch(generated_from_version)]]
-    set patch(apply_to_version_name) [ad_decode $patch(apply_to_version) "" "Undecided" [bug_tracker::version_get_name -version_id $patch(apply_to_version)]]
+    set patch(generated_from_version_name) [ad_decode $patch(generated_from_version) "" "[_ bug-tracker.Unknown]" [bug_tracker::version_get_name -version_id $patch(generated_from_version)]]
+    set patch(apply_to_version_name) [ad_decode $patch(apply_to_version) "" "[_ bug-tracker.Undecided]" [bug_tracker::version_get_name -version_id $patch(apply_to_version)]]
     set patch(applied_to_version_name) [bug_tracker::version_get_name -version_id $patch(applied_to_version)]
 
     if {$user_id != 0} {
@@ -275,16 +276,16 @@
     # - update the status (the new status will show up in the form)
     switch -- $mode {
         accept {
-            set patch(status) "accepted"
+            set patch(status) "[_ bug-tracker.accepted]"
         }
         refuse {
-            set patch(status) "refused"
+            set patch(status) "[_ bug-tracker.refused]"
         }
         delete {
-            set patch(status) "deleted"
+            set patch(status) "[_ bug-tracker.deleted]"
         }
         reopen {
-            set patch(status) "open"
+            set patch(status) "[_ bug-tracker.open]"
         }
     }
 
@@ -294,8 +295,10 @@
             -value $patch(patch_number)
     element set_properties patch component_id \
             -value [ad_decode [info exists field_editable_p(component_id)] 1 $patch(component_id) $patch(component_name)]
-    if { [string equal $mode "view"] } {
-        set map_new_bug_link [ad_decode $write_or_submitter_p "1" "\[ <a href=\"map-patch-to-bugs?patch_number=$patch(patch_number)\">Map to bugs</a> \]" ""]
+    if { [string equal $mode "[_ bug-tracker.view]"] } {
+        set bugs_name [bug_tracker::conn bugs]
+	set map_to_bugs [_ bug-tracker.Map] 
+        set map_new_bug_link [ad_decode $write_or_submitter_p "1" "\[ <a href=\"map-patch-to-bugs?patch_number=$patch(patch_number)\">$map_to_bugs</a> \]" ""]
         element set_properties patch fixes_bugs \
             -value "[bug_tracker::get_bug_links -patch_id $patch(patch_id) -patch_number $patch(patch_number) -write_or_submitter_p $write_or_submitter_p] <br>$map_new_bug_link"
     }
@@ -317,7 +320,7 @@
 
     set deleted_p [string equal $patch(status) deleted]
 
-    if { ( [string equal $patch(status) open] && ![string equal $mode "accept"]) || [string equal $patch(status) "refused"] } {
+    if { ( [string equal $patch(status) open] && ![string equal $mode [_ bug-tracker.accept]]) || [string equal $patch(status) [_ bug-tracker.refused]] } {
         element set_properties patch applied_to_version -widget hidden
     }
 
@@ -330,65 +333,73 @@
         <blockquote>[bug_tracker::bug_convert_comment_to_html -comment $comment -format $comment_format]</blockquote>"
     }
 
-    if { [string equal $mode "view"] } {
+    if { [string equal $mode "[_ bug-tracker.view]"] } {
         element set_properties patch description -value $action_html
     } else {
+
+	set patch_pretty_name "$patch(now_pretty)"
+	set patch_action_pretty_mode [bug_tracker::patch_action_pretty $mode]
+	set bt_user_first_names [bug_tracker::conn user_first_names]
+	set bt_user_last_name [bug_tracker::conn user_last_name]
+
         element set_properties patch description \
                 -history $action_html \
-                -header "$patch(now_pretty) [bug_tracker::patch_action_pretty $mode] by [bug_tracker::conn user_first_names] [bug_tracker::conn user_last_name]" \
+                -header "[_ bug-tracker.%patch_pretty_name% %patch_action_pretty_mode%  by %bt_user_first_names% %bt_user_last_name%]" \
                 -value ""
     }    
     
     # Now that we have the patch summary we can make the page title more informative
-    set page_title "Patch #$patch_number: $patch(summary)"
 
+    set Patch_name [bug_tracker::conn Patch]
+    set page_title "[_ bug-tracker.Patch_4]"
+
     # Create the buttons
     # If the user has submitted the patch he gets full write access on the patch
     set user_is_submitter_p [expr $patch(submitter_user_id) == [ad_conn user_id]]
-    if { [string equal $mode "view"] } {
+    if { [string equal $mode "[_ bug-tracker.view]"] } {
         set button_form_export_vars [export_vars -form { patch_number }]
         multirow create button name label
 
         if { $write_p || $user_is_submitter_p } {
-            multirow append button "comment" "Comment"
-            multirow append button "edit" "Edit"
+            multirow append button "comment" "[_ bug-tracker.Comment]"
+            multirow append button "edit" "[_ bug-tracker.Edit]"
         }
 
         switch -- $patch(status) {
             open {
                 if { $write_p } {
-                    multirow append button "accept" "Accept"
-                    multirow append button "refuse" "Refuse"
+                    multirow append button "accept" "[_ bug-tracker.Accept]"
+                    multirow append button "refuse" "[_ bug-tracker.Refuse]"
                 }
 
                 # Only the submitter can cancel the patch
                 if { $user_is_submitter_p } {
-                    multirow append button "delete" "Delete"
+                    multirow append button "delete" "[_ bug-tracker.Delete]"
                 }
             }
             accepted {
                 if { $write_p } {
-                    multirow append button "reopen" "Reopen"
+                    multirow append button "reopen" "[_ bug-tracker.Reopen]"
                 }
             }
             refused {
                 if { $write_p } {
-                    multirow append button "reopen" "Reopen"    
+                    multirow append button "reopen" "[_ bug-tracker.Reopen]"    
                 }
             }
             deleted {
                 if { $write_p || $user_is_submitter_p } {
-                    multirow append button "reopen" "Reopen"
+                    multirow append button "reopen" "[_ bug-tracker.Reopen]"
                 }
             }
         }
     }    
 
     # Check that the user is permitted to change the patch
-    if { ![string equal $mode "view"] && !$write_p && !$user_is_submitter_p } {
+    if { ![string equal $mode "[_ bug-tracker.view]"] && !$write_p && !$user_is_submitter_p } {
         ns_log notice "$patch(submitter_user_id) doesn't have write on object $patch(patch_id)"
-        ad_return_forbidden "Permission Denied" "<blockquote>
-        You don't have permission to edit this patch.
+        ad_return_forbidden "[_ bug-tracker.Permission]" "<blockquote>
+        [_ bug-tracker.You_6]
         </blockquote>"
         ad_script_abort
     }    
@@ -415,15 +426,15 @@
     
     switch -- $mode {
         accept {
-            set status "accepted"
+            set status "[_ bug-tracker.accepted]"
             lappend update_exprs "status = :status"
         }
         refuse {
-            set status "refused"
+            set status "[_ bug-tracker.refused]"
             lappend update_exprs "status = :status"            
         }
         reopen {
-            set status "open"
+            set status "[_ bug-tracker.open]"
             lappend update_exprs "status = :status"
         }
         edit {
@@ -435,7 +446,7 @@
             } 
         }
         delete {
-            set status "deleted"
+            set status "[_ bug-tracker.deleted]"
             lappend update_exprs "status = :status"            
         }
     }
@@ -458,17 +469,16 @@
         set action $mode
         db_dml patch_action {}
 
-        if { [string equal $mode "accept"] } {
+        if { [string equal $mode "[_ bug-tracker.accept]"] } {
             # Resolve any bugs that the user selected
             set resolve_bugs [element get_values patch resolve_bugs]
 
             foreach bug_number $resolve_bugs {
 
-                set resolve_description "Fixed by <a href=\"patch?patch_number=$patch_number\">patch #$patch_number</a>"
-                
+                set resolve_description "[_ bug-tracker.Fixed_2]"                
                 set workflow_id [bug_tracker::bug::get_instance_workflow_id]
                 set bug_id [bug_tracker::get_bug_id -bug_number $bug_number -project_id $package_id]
-                set action_id [workflow::action::get_id -workflow_id $workflow_id -short_name "resolve"]
+                set action_id [workflow::action::get_id -workflow_id $workflow_id -short_name "[_ bug-tracker.resolve]"]
                 
                 bug_tracker::bug::edit \
                     -bug_id $bug_id \
Index: openacs-4/packages/bug-tracker/www/prefs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/prefs.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/prefs.tcl	28 Aug 2003 09:45:29 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/prefs.tcl	29 Mar 2004 15:07:34 -0000	1.10
@@ -19,15 +19,15 @@
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
 
-set page_title "Your Preferences"
+set page_title "[_ bug-tracker.Your]"
 
 set context [list $page_title]
 
 set user_id [ad_conn user_id]
 
 ad_form -name prefs -cancel_url $return_url -form {
     {user_version:integer(select),optional
-        {label "Your version"}
+        {label "[_ bug-tracker.Your_1]"}
         {options {[bug_tracker::version_get_options -include_unknown]}}
     }
     {return_url:text(hidden)
Index: openacs-4/packages/bug-tracker/www/unmap-patch-from-bug.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/unmap-patch-from-bug.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/unmap-patch-from-bug.tcl	25 Sep 2003 12:13:37 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/unmap-patch-from-bug.tcl	29 Mar 2004 15:07:34 -0000	1.3
@@ -16,7 +16,7 @@
 set user_is_submitter_p [expr $user_id == [bug_tracker::get_patch_submitter -patch_number $patch_number]]
 
 if { ![expr $user_is_submitter_p || $write_p] } {            
-    ad_return_forbidden "Permission Denied" "You do not have permission to unmap a bug from this patch. Only the submitter of the patch and users with write permission on the Bug Tracker package instance (project) may do so."            
+    ad_return_forbidden "[_ bug-tracker.Permission]" "[_ bug-tracker.You_7]"            
     ad_script_abort
 }
 
Index: openacs-4/packages/bug-tracker/www/admin/categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/www/admin/categories.adp	22 Sep 2003 15:45:11 -0000	1.4
+++ openacs-4/packages/bug-tracker/www/admin/categories.adp	29 Mar 2004 15:07:35 -0000	1.5
@@ -7,12 +7,12 @@
 
 <table cellspacing="1" cellpadding="3" class="bt_listing">
   <tr class="bt_listing_header">
-    <th class="bt_listing">Category Type</th>
-    <th class="bt_listing">Category</th>
+    <th class="bt_listing">#bug-tracker.Category_Type#</th>
+    <th class="bt_listing">#bug-tracker.Category#</th>
     <th class="bt_listing"># @pretty_names.Bugs@</th>
-    <th class="bt_listing">Default</th>
-    <th class="bt_listing">Edit</th>
-    <th class="bt_listing">Delete</th>
+    <th class="bt_listing">#bug-tracker.Default#</th>
+    <th class="bt_listing">#acs-kernel.common_Edit#</th>
+    <th class="bt_listing">#acs-kernel.common_Delete#</th>
   </tr>
   <if @categories:rowcount@ gt 0>
     <multiple name="categories">
@@ -66,7 +66,7 @@
             </td>
             <td class="bt_listing" align="center">
               <if @categories.default_p@ true><b>*</b></if>
-              <if @categories.set_default_url@ not nil><a href="@categories.set_default_url@">set</a></if>
+              <if @categories.set_default_url@ not nil><a href="@categories.set_default_url@">#bug-tracker.set#</a></if>
             </td>
             <td class="bt_listing" align="center">
               <if @categories.edit_url@ not nil>
@@ -86,7 +86,7 @@
         <tr class="bt_listing_even">
           <td class="bt_listing">&nbsp;</td>
           <td class="bt_listing" colspan="5">
-            <i>No categories of this type.</i>
+            <i>#bug-tracker.No_categories_of_this_type#</i>
           </td>
         </tr>
       </else>
@@ -95,7 +95,7 @@
         <td class="bt_listing">&nbsp;</td>
         <td class="bt_listing">
           <b>&raquo;</b>
-          <a href="@categories.new_url@">Add category</a>
+          <a href="@categories.new_url@">#bug-tracker.Add_category#</a>
         </td>
           <td class="bt_listing">&nbsp;</td>
         <td class="bt_listing">&nbsp;</td>
@@ -116,15 +116,16 @@
   <tr class="bt_listing_even">
     <td class="bt_listing" colspan="6">
       <b>&raquo;</b>
-      <a href="@type_new_url@">Create new category type</a>
+      <a href="@type_new_url@">#bug-tracker.Create_new_category_type#</a>
     </td>
   </tr>
 
 </table>
 
 <p class="bt">
   <b>&raquo;</b>
-  <a href="@default_setup_url@">Use default setup</a>
+  <a href="@default_setup_url@">#bug-tracker.Use_default_setup#</a>
 </p>
 
 </blockquote>
+
Index: openacs-4/packages/bug-tracker/www/admin/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/categories.tcl	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/categories.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -3,7 +3,7 @@
 }
 
 set project_name [bug_tracker::conn project_name]
-set page_title "Manage Categories"
+set page_title "[_ bug-tracker.Manage_Categories]"
 set context_bar [ad_context_bar $page_title]
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/bug-tracker/www/admin/category-defaults.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-defaults.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/category-defaults.tcl	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/category-defaults.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -3,8 +3,8 @@
 }
 
 set project_name [bug_tracker::conn project_name]
-set page_title "Default Category Setup"
-set context_bar [ad_context_bar [list categories "Manage Categories"] $page_title]
+set page_title [_ bug-tracker.lt_Default_Category_Setu]
+set context_bar [ad_context_bar [list categories [_ bug-tracker.Manage_Categories]] $page_title]
 
 array set default_configs [bug_tracker::get_default_configurations]
 
@@ -15,7 +15,7 @@
 }
 
 ad_form -name setup -cancel_url categories -form {
-    {setup:text(select) {label "Choose setup"} {options $options}}
+    {setup:text(select) {label [_ bug-tracker.Choose_setup]} {options $options}}
 } -on_submit {
     array set config $default_configs($setup)
     
Index: openacs-4/packages/bug-tracker/www/admin/category-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/category-edit.adp	26 Sep 2003 06:42:23 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/category-edit.adp	29 Mar 2004 15:07:35 -0000	1.6
@@ -6,7 +6,4 @@
 <formtemplate id="keyword"></formtemplate>
 
 
-<blockquote> <b>Note:</b> Categories are sorted by their
-names. Therefore, it's a good idea to use names of ths form &quot;1 -
-High&quot;, &quot;2 - Normal&quot;, etc., or &quot;A - Critical&quot;,
-&quot;B - Major&quot;, etc., thus making the order obvious. </blockquote>
+<blockquote> #bug-tracker.Sort_Order_Note# </blockquote>
Index: openacs-4/packages/bug-tracker/www/admin/category-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/category-edit.tcl	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/category-edit.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -9,19 +9,19 @@
 set project_name [bug_tracker::conn project_name]
 
 if { (![info exists keyword_id] && ![info exists parent_id]) || [string equal $type_p "t"] } {
-    set object_type_name "Category Type"
+    set object_type_name [_ bug-tracker.Category_Type]
 } else {
-    set object_type_name "Category"
+    set object_type_name [_ bug-tracker.Category]
 }
 
 if { [info exists keyword_id] } {
-    set function "Edit"
+    set function [_ acs-kernel.common_Edit]
 } else {
-    set function "Add"
+    set function [_ acs-kernel.common_Add]
 }
 
-set page_title "$function $object_type_name"
-set context_bar [ad_context_bar [list categories "Manage Categories"] $page_title]
+set page_title [_ bug-tracker.function]
+set context_bar [ad_context_bar [list categories [_ bug-tracker.Manage_Categories]] $page_title]
 
 
 ad_form -name keyword -cancel_url categories -form {
Index: openacs-4/packages/bug-tracker/www/admin/component-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/component-ae.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	28 Aug 2003 09:45:30 -0000	1.9
+++ openacs-4/packages/bug-tracker/www/admin/component-ae.tcl	29 Mar 2004 15:07:35 -0000	1.10
@@ -8,28 +8,31 @@
 }
 
 set package_id [ad_conn package_id]
+set Component_name [bug_tracker::conn Component]
+set component_name [bug_tracker::conn component]
 
 if { [info exists component_id] } {
-    set page_title "Edit [bug_tracker::conn Component]"
+    set page_title [_ bug-tracker.Edit_1]
 } else {
-    set page_title "Add [bug_tracker::conn Component]"
+    set page_title [_ bug-tracker.Add]
 }
 set context [list $page_title]
 
 # LARS:
 # I've hidden the description, because we don't use it anywhere
+set filter_url_string "[ad_conn package_url]com/this-name/"
 
 ad_form -name component -cancel_url $return_url -form {
     {component_id:key(acs_object_id_seq)}
     {return_url:text(hidden) {value $return_url}}
-    {name:text {html { size 50 }} {label "[bug_tracker::conn Component] Name"}}
+    {name:text {html { size 50 }} {label "[_ bug-tracker.Component]"}}
     {description:text(hidden),optional {label {Description}} {html { cols 50 rows 8 }}}
-    {url_name:text,optional {html { size 50 }} {label {Name in shortcut URL}}
-        {help_text "You can filter by this [bug_tracker::conn component] by viisting [ad_conn package_url]com/this-name/"}
+    {url_name:text,optional {html { size 50 }} {label {[_ bug-tracker.Name_in_shortcut_URL]}}
+        {help_text "[_ bug-tracker.You]"}
     }
     {maintainer:search,optional
         {result_datatype integer}
-        {label "Maintainer"}
+        {label "[_ bug-tracker.Maintainer]"}
         {options [bug_tracker::users_get_options]}
         {search_query {[db_map user_search]}}
     }
Index: openacs-4/packages/bug-tracker/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/bug-tracker/www/admin/index.adp	22 Sep 2003 15:45:11 -0000	1.6
+++ openacs-4/packages/bug-tracker/www/admin/index.adp	29 Mar 2004 15:07:35 -0000	1.7
@@ -7,10 +7,10 @@
 <if @bugs_exist_p@ false>
   <div style="background-color: #ccccff; padding: 12px; border: dashed 1px #6666ff;">
     <p>
-      <b>This is a new project.</b>
+      <b>#bug-tracker.This_is_a_new_project#</b>
     </p>
     <p>  
-      <b>&raquo;</b> <a href="initial-setup">Initial project configuration</a>
+      <b>&raquo;</b> <a href="initial-setup">#bug-tracker.Initial_project_config#</a>
     </p>
   </div>
 </if>
@@ -20,38 +20,38 @@
     <td colspan="3">
     </td>
     <th>
-      Edit
+      #acs-kernel.common_Edit#
     </th>
     <th>
-      Delete
+      #acs-kernel.common_Delete#
     </th>
   </tr>
   <tr bgcolor="#666666">
     <td colspan="3">
       <font color=white><b>@project_name@</b></font>
     </td>
     <td align="center">
-      <a href="@project_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@project_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
     </td>
   </tr>
   <tr bgcolor="#cccccc">
     <td colspan="2">
-      Maintainer:
+      #bug-tracker.Maintainer#
       <if @project.maintainer@ not nil>
         <a href="@project.maintainer_url@" title="Email: @project.maintainer_email@">@project.maintainer_first_names@ @project.maintainer_last_name@</a>
       </if>
       <else>
-        <i>No Maintainer</i> 
+        <i>#bug-tracker.No_Maintainer#</i> 
       </else>
     </td>
     <td align="center">
       &nbsp;
     </td>
     <td align="center">
-      <a href="@project_maintainer_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@project_maintainer_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
@@ -61,10 +61,10 @@
   <if @versions_p@ true>
     <tr bgcolor="#cccccc">
       <td colspan="3">
-        Versions
+        #bug-tracker.Versions#
       </td>
       <td align="center">
-        <a href="@versions_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+        <a href="@versions_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
       </td>
       <td align="center">
         &nbsp;
@@ -74,32 +74,32 @@
 
   <tr bgcolor="#cccccc">
     <td colspan="3">
-      Categories
+      #bug-tracker.Categories#
     </td>
     <td align="center">
-      <a href="@categories_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@categories_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
     </td>
   </tr>
   <tr bgcolor="#cccccc">
     <td colspan="3">
-      Permissions
+     #bug-tracker.Permissions#
     </td>
     <td align="center">
-      <a href="@permissions_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@permissions_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
     </td>
   </tr>
   <tr bgcolor="#cccccc">
     <td colspan="3">
-      Parameters
+     #bug-tracker.Parameters#
     </td>
     <td align="center">
-      <a href="@parameters_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@parameters_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
@@ -110,21 +110,21 @@
 <!--
   <tr bgcolor="#cccccc">
     <td colspan="3">
-      Priority codes
+     #bug-tracker.Priority_codes#
     </td>
     <td align="center">
-      <a href="@priority_codes_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@priority_codes_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
     </td>
   </tr>
   <tr bgcolor="#cccccc">
     <td colspan="2">
-      Severity codes
+     #bug-tracker.Severity_Codes#
     </td>
     <td align="center">
-      <a href="@severity_codes_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+      <a href="@severity_codes_edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
     </td>
     <td align="center">
       &nbsp;
@@ -148,31 +148,32 @@
       <td>@components.component_name@</td>
       <td>
         <if @components.maintainer@ not nil>
-          <a href="@components.maintainer_url@" title="Email: @components.maintainer_email@">@components.maintainer_first_names@ @components.maintainer_last_name@</a>
+          <a href="@components.maintainer_url@" title="#bug-tracker.Email# @components.maintainer_email@">@components.maintainer_first_names@ @components.maintainer_last_name@</a>
         </if>
-        <else><i>No maintainer</i></else>
+        <else><i>#bug-tracker.No_Maintainer#</i></else>
       </td>
       <td align="right">
-        <if @components.view_bugs_url@ not nil><a href="@components.view_bugs_url@" title="View the @pretty_names.bugs@ for this component"></if>@components.num_bugs@ <if @components.num_bugs@ eq 1>@pretty_names.bug@</if><else>@pretty_names.bugs@</else><if @components.view_bugs_url@ not nil></a></if>
+        <if @components.view_bugs_url@ not nil><a href="@components.view_bugs_url@" title="#bug-tracker.View_the_bug_fo_component#"></if>@components.num_bugs@ <if @components.num_bugs@ eq 1>@pretty_names.bug@</if><else>@pretty_names.bugs@</else><if @components.view_bugs_url@ not nil></a></if>
       </td>
       <td align="center">
-        <a href="@components.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="Edit"></a>
+        <a href="@components.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Edit#"></a>
       </td>
       <td align="center">
         <if @components.delete_url@ not nil>
-          <a href="@components.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" border="0" alt="Delete"></a>
+          <a href="@components.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" border="0" alt="#acs-kernel.common_Delete#"></a>
         </if>
       </td>
     </tr>
   </multiple>
   <if @components:rowcount@ eq 0>
     <tr bgcolor="#cccccc">
-      <td colspan="5"><i>No components</i></td>
+      <td colspan="5"><i>#bug-tracker.No_components#</i></td>
     </tr>
   </if>
   <tr bgcolor="#bbbbbb">
-    <td colspan="5"><b>&raquo;</b> <a href="@component_add_url@">Create new @pretty_names.component@</a></td>
+    <td colspan="5"><b>&raquo;</b> <a href="@component_add_url@">#bug-tracker.Create_new# @pretty_names.component@</a></td>
   </tr>
 </table>
 </blockquote>
 
+
Index: openacs-4/packages/bug-tracker/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/admin/index.tcl	26 Sep 2003 08:38:31 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/admin/index.tcl	29 Mar 2004 15:07:35 -0000	1.9
@@ -10,7 +10,7 @@
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
-set page_title "Administration"
+set page_title [_ bug-tracker.Administration]
 
 set bugs_exist_p [bug_tracker::bugs_exist_p]
 
Index: openacs-4/packages/bug-tracker/www/admin/initial-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/initial-setup.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	26 Sep 2003 06:42:24 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	29 Mar 2004 15:07:35 -0000	1.6
@@ -2,12 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<p>
-  Choose your project's initial configuration.
-</p>
+#bug-tracker.Initial_Setup#
 
-<p>
-  There's nothing that we do here that you can't redo later, if you want to.
-</p>
-
 <formtemplate id="setup"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/initial-setup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/initial-setup.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/initial-setup.tcl	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/initial-setup.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -3,7 +3,7 @@
 }
 
 set project_name [bug_tracker::conn project_name]
-set page_title "Initial Setup"
+set page_title [_ bug-tracker.Initial]
 set context_bar [ad_context_bar $page_title]
 
 array set default_configs [bug_tracker::get_default_configurations]
@@ -13,10 +13,10 @@
 foreach name [lsort -ascii [array names default_configs]] {
     lappend options [list $name $name]
 }
-lappend options [list "Custom" "custom"]
+lappend options [list "[_ bug-tracker.Custom]" "custom"]
 
 ad_form -name setup -cancel_url . -form {
-    {setup:text(select) {label "Choose setup"} {options $options}}
+    {setup:text(select) {label "[_ bug-tracker.Choose]"} {options $options}}
 } -on_submit {
     if { [info exists default_configs($setup)] } {
         array set config $default_configs($setup)
Index: openacs-4/packages/bug-tracker/www/admin/permissions-user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/permissions-user-add.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/permissions-user-add.tcl	22 Sep 2003 15:45:11 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/permissions-user-add.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -8,7 +8,7 @@
 
 set object_id [ad_conn package_id]
 
-set page_title "Add User"
+set page_title [_ bug-tracker.Add_1]
 
-set context [list [list "permissions" "Permissions"] $page_title]
+set context [list [list "permissions" "[_ bug-tracker.Permissions]"] $page_title]
 
Index: openacs-4/packages/bug-tracker/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/permissions.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/permissions.adp	22 Sep 2003 15:45:11 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/permissions.adp	29 Mar 2004 15:07:35 -0000	1.2
@@ -5,5 +5,6 @@
 <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add">
 
 <p>
-  <b>&raquo;</b> <a href=".">Return</a>
+  <b>&raquo;</b> <a href=".">#bug-tracker.Return#</a>
 </p>
+
Index: openacs-4/packages/bug-tracker/www/admin/permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/permissions.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/permissions.tcl	22 Sep 2003 15:45:11 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/permissions.tcl	29 Mar 2004 15:07:35 -0000	1.2
@@ -8,7 +8,7 @@
 
 set object_id [ad_conn package_id]
 
-set page_title "Permissions"
+set page_title [_ bug-tracker.Permissions]
 
 set context [list $page_title]
 
Index: openacs-4/packages/bug-tracker/www/admin/project-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-edit.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	28 Aug 2003 09:45:30 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/admin/project-edit.tcl	29 Mar 2004 15:07:35 -0000	1.9
@@ -11,19 +11,19 @@
 set project_name [bug_tracker::conn project_name]
 set package_id [ad_conn package_id]
 
-set page_title "Edit Project"
+set page_title [_ bug-tracker.Edit_2]
 set context [list $page_title]
 
 ad_form -name project -cancel_url $return_url -form {
     package_id:key
     {return_url:text(hidden) {value $return_url}}
-    {name:text {html { size 50 }} {label "Project Name"}
+    {name:text {html { size 50 }} {label "[_ bug-tracker.Project]"}
         {help_text {This is also the name of this package in the site map}}
     }
-    {description:text(hidden),optional {label "Description"} {html { cols 50 rows 8 }}
+    {description:text(hidden),optional {label "[_ bug-tracker.Description]"} {html { cols 50 rows 8 }}
         {help_text {This isn't actually used anywhere at this point. Sorry.}}
     }
-    {email_subject_name:text,optional {html { size 50 }} {label "Notification tag"}
+    {email_subject_name:text,optional {html { size 50 }} {label "[_ bug-tracker.Notification]"}
         {help_text {This text will be included in square brackets at the beginning of all notifications, for example \[OpenACS Bugs\]}}
     }
     {maintainer:search,optional
Index: openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	28 Aug 2003 09:45:30 -0000	1.8
+++ openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.tcl	29 Mar 2004 15:07:35 -0000	1.9
@@ -10,7 +10,7 @@
 
 set package_id [ad_conn package_id]
 
-set page_title "Edit Project Maintainer"
+set page_title [_ bug-tracker.Edit_3]
 
 set context [list $page_title]
 
Index: openacs-4/packages/bug-tracker/www/admin/version-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-ae.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	28 Aug 2003 09:45:30 -0000	1.7
+++ openacs-4/packages/bug-tracker/www/admin/version-ae.tcl	29 Mar 2004 15:07:35 -0000	1.8
@@ -11,36 +11,36 @@
 set package_id [ad_conn package_id]
 
 if { [info exists version_id] } {
-    set page_title "Edit Version"
+    set page_title [_ bug-tracker.Edit_4]
 } else {
-    set page_title "Add Version"
+    set page_title [_ bug-tracker.Add_2]
 }
-set context [list [list $return_url "Versions"] $page_title]
+set context [list [list $return_url "[_ bug-tracker.Versions]"] $page_title]
 
 ad_form -name version -cancel_url $return_url -form {
     {version_id:key(acs_object_id_seq)}
-    {version_name:text {label "Version name"} {html { size 50 }}}
-    {description:text(textarea),optional {label "Description"} {html { cols 50 rows 8 }}}
-    {supported_platforms:text,optional {label "Supported platforms"} {html { size 50 }}}
+    {version_name:text {label "[_ bug-tracker.Version_1]"} {html { size 50 }}}
+    {description:text(textarea),optional {label "[_ bug-tracker.Description]"} {html { cols 50 rows 8 }}}
+    {supported_platforms:text,optional {label "[_ bug-tracker.Supported]"} {html { size 50 }}}
     {maintainer:search,optional
         {result_datatype integer}
-        {label "Maintainer"}
+        {label "[_ bug-tracker.Maintainer]"}
         {options {[bug_tracker::users_get_options]}}
         {search_query {[db_map user_search]}}
     }
     {anticipated_freeze_date:date,to_sql(sql_date),to_html(sql_date),optional
-        {label "Anticipated freeze"} optional
+        {label "[_ bug-tracker.Anticipated]"} optional
     }
     {actual_freeze_date:date,to_sql(sql_date),to_html(sql_date),optional
-        {label "Actual freeze"} optional
+        {label "[_ bug-tracker.Actual]"} optional
     }
     {anticipated_release_date:date,to_sql(sql_date),to_html(sql_date) ,optional
-        {label "Anticipated release"} optional
+        {label "[_ bug-tracker.Anticipated_1]"} optional
     }
     {actual_release_date:date,to_sql(sql_date),to_html(sql_date),optional
-        {label "Actual release"} optional
+        {label "[_ bug-tracker.Actual_1]"} optional
     }
-    {assignable_p:text(radio),optional {label "Assignable?"} {options {{Yes t} {No f}}}}
+    {assignable_p:text(radio),optional {label "[_ bug-tracker.Assignable?]"} {options {{Yes t} {No f}}}}
     {return_url:text(hidden) {value $return_url}}
 } -select_query_name version_select  -new_request {
     set assignable_p "t"
Index: openacs-4/packages/bug-tracker/www/admin/version-release.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-release.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/version-release.tcl	28 Aug 2003 09:45:30 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/version-release.tcl	29 Mar 2004 15:07:35 -0000	1.3
@@ -4,18 +4,18 @@
     version_id:integer
 }
 
-set page_title "Release Version"
+set page_title [_ bug-tracker.Release_1]
 
-set context [list [list versions "Versions"] $page_title]
+set context [list [list versions [_ bug-tracker.Versions]] $page_title]
 
 ad_form -name version -cancel_url versions -form {
     version_id:key
-    {version_name:text {mode display} {label "Version Name"}}
+    {version_name:text {mode display} {label "[_ bug-tracker.Version_2]"}}
     {anticipated_release_date:date,to_sql(sql_date),to_html(sql_date),optional
-        {mode display} {label "Anticipated release date"}
+        {mode display} {label "[_ bug-tracker.Anticipated_2]"}
     }
     {actual_release_date:date,to_sql(sql_date),to_html(sql_date)
-        {label "Actual release date"}
+        {label "[_ bug-tracker.Actual_2]"}
     }
 } -select_query_name version_select -edit_data {
     db_dml update_version {}
Index: openacs-4/packages/bug-tracker/www/admin/versions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/versions.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/versions.adp	22 Sep 2003 15:45:11 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/versions.adp	29 Mar 2004 15:07:35 -0000	1.6
@@ -2,22 +2,22 @@
 <property name="title">@project_name;noquote@ Versions</property>
 <property name="context_bar">@context_bar;noquote@</property>
 
-<h3>In Development</h3>
+<h3>#bug-tracker.In_Development#</h3>
 
 <if @current_version:rowcount@ eq 0>
-  <i>None</i>
+  <i>#bug-tracker.None#</i>
 </if>
 <else>
   <table cellspacing="1" cellpadding="3" class="bt_listing">
     <tr class="bt_listing_header">
-      <th>Version</th>
-      <th>Planned Freeze</th>
-      <th>Planned Release</th>
-      <th>Maintainer</th>
-      <th>Assign</th>
-      <th>Edit</th>
-      <th>Delete</th>
-      <th>Release</th>
+      <th>#bug-tracker.Version#</th>
+      <th>#bug-tracker.Planned_Freeze#</th>
+      <th>#bug-tracker.Planned_Release#</th>
+      <th>#bug-tracker.Maintainer_1#</th>
+      <th>#bug-tracker.Assign#</th>
+      <th>#acs-kernel.common_Edit#</th>
+      <th>#acs-kernel.common_Delete#</th>
+      <th>#bug-tracker.Release#</th>
     </tr>
     <multiple name="current_version">
       <if @current_version.rownum@ odd>
@@ -40,21 +40,21 @@
             <a href="@current_version.maintainer_url@" title="Email: @current_version.maintainer_email@">@current_version.maintainer_first_names@ 
             @current_version.maintainer_last_name@</a>
           </if>
-          <else><i>None</i></else>
+          <else><i>#bug-tracker.None#</i></else>
         </td>
         <td class="bt_listing">
           @current_version.assignable_p_pretty@
         </td>
         <td class="bt_listing" align="center">
-          <a href="@current_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="Edit" border="0"></a>
+          <a href="@current_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="#acs-kernel.common_Edit#" border="0"></a>
         </td>
         <td class="bt_listing" align="center">
           <if @current_version.delete_url@ not nil>
-            <a href="@current_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="Delete" border="0"></a>
+            <a href="@current_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="#acs-kernel.common_Delete#" border="0"></a>
           </if>
         </td>
         <td class="bt_listing">
-          <a href="@current_version.release_url@">Release this version</a>
+          <a href="@current_version.release_url@">#bug-tracker.Release_this_version#</a>
         </td>
       </tr>
     </multiple>
@@ -63,22 +63,22 @@
 
 
 
-<h3>Future Versions</h3>
+<h3>#bug-tracker.Future_Versions#</h3>
 
 <if @future_version:rowcount@ eq 0>
-  <i>None</i>
+  <i>#bug-tracker.None#</i>
 </if>
 <else>
   <table cellspacing="1" cellpadding="3" class="bt_listing">
     <tr class="bt_listing_header">
-      <th>Version</th>
-      <th>Planned Freeze</th>
-      <th>Planned Release</th>
-      <th>Maintainer</th>
-      <th>Assign</th>
-      <th>Edit</th>
-      <th>Delete</th>
-      <th>Current</th>
+      <th>#bug-tracker.Version#</th>
+      <th>#bug-tracker.Planned_Freeze#</th>
+      <th>#bug-tracker.Planned_Release#</th>
+      <th>#bug-tracker.Maintainer#</th>
+      <th>#bug-tracker.Assign#</th>
+      <th>#acs-kernel.common_Edit#</th>
+      <th>#acs-kernel.common_Delete#</th>
+      <th>#bug-tracker.Current#</th>
     </tr>
     <multiple name="future_version">
       <if @future_version.rownum@ odd>
@@ -98,24 +98,24 @@
         </td>
         <td class="bt_listing">
           <if @future_version.maintainer@ not nil>
-            <a href="@future_version.maintainer_url@" title="Email: @future_version.maintainer_email@">@future_version.maintainer_first_names@ 
+            <a href="@future_version.maintainer_url@" title="#bug-tracker.Email# @future_version.maintainer_email@">@future_version.maintainer_first_names@ 
             @future_version.maintainer_last_name@</a>
           </if>
-          <else><i>None</i></else>
+          <else><i>#bug-tracker.None#</i></else>
         </td>
         <td class="bt_listing">
           @future_version.assignable_p_pretty@
         </td>
         <td class="bt_listing" align="center">
-          <a href="@future_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="Edit" border="0"></a>
+          <a href="@future_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="#acs-kernel.common_Edit#" border="0"></a>
         </td>
         <td class="bt_listing" align="center">
           <if @future_version.delete_url@ not nil>
-            <a href="@future_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="@bug-tracker.Delete#" border="0"></a>
+            <a href="@future_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="acs-kernel.common_Delete#" border="0"></a>
           </if>
         </td>
         <td class="bt_listing">
-          <a href="@future_version.set_active_url@">Set to current</a>
+          <a href="@future_version.set_active_url@">#bug-tracker.Set_to_current#</a>
         </td>
       </tr>
     </multiple>
@@ -124,22 +124,22 @@
 
 <p>
 
-<a href="@version_add_url@">Add new version</a>
+<a href="@version_add_url@">#bug-tracker.Add_new_version#</a>
 
-<h3>Already Released Versions</h3>
+<h3>#bug-tracker.Already_released_versions#</h3>
 
 <if @past_version:rowcount@ eq 0>
-  <i>None</i>
+  <i>#bug-tracker.None#</i>
 </if>
 <else>
   <table cellspacing="1" cellpadding="3" class="bt_listing">
     <tr class="bt_listing_header">
-      <th>Version</th>
-      <th>Planned Release</th>
-      <th>Actual Release</th>
-      <th>Maintainer</th>
-      <th>Edit</th>
-      <th>Delete</th>
+      <th>#bug-tracker.Version#</th>
+      <th>#bug-tracker.Planned_Release#</th>
+      <th>#bug-tracker.Actual_Release#</th>
+      <th>#bug-tracker.Maintainer#</th>
+      <th>#acs-kernel.common_Edit#</th>
+      <th>#acs-kernel.common_Delete#</th>
     </tr>
     <multiple name="past_version">
       <if @past_version.rownum@ odd>
@@ -159,17 +159,17 @@
         </td>
         <td class="bt_listing">
           <if @past_version.maintainer@ not nil>
-            <a href="@past_version.maintainer_url@" title="Email: @past_version.maintainer_email@">@past_version.maintainer_first_names@ 
+            <a href="@past_version.maintainer_url@" title="#bug-tracker.Email# @past_version.maintainer_email@">@past_version.maintainer_first_names@ 
             @past_version.maintainer_last_name@</a>
           </if>
-          <else><i>None</i></else>
+          <else><i>#bug-tracker.None#</i></else>
         </td>
         <td class="bt_listing" align="center">
-          <a href="@past_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="Edit" border="0"></a>
+          <a href="@past_version.edit_url@"><img src="../graphics/Edit16.gif" width="16" height="16" alt="#acs-kernel.common_Edit#" border="0"></a>
         </td>
         <td class="bt_listing" align="center">
           <if @past_version.delete_url@ not nil>
-            <a href="@past_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="@bug-tracker.Delete#" border="0"></a>
+            <a href="@past_version.delete_url@"><img src="../graphics/Delete16.gif" width="16" height="16" alt="acs-kernel.common_Delete#" border="0"></a>
           </if>
         </td>
       </tr>
Index: openacs-4/packages/bug-tracker/www/admin/versions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/versions.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/admin/versions.tcl	28 Aug 2003 09:45:30 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/admin/versions.tcl	29 Mar 2004 15:07:35 -0000	1.6
@@ -11,7 +11,7 @@
 set package_id [ad_conn package_id]
 set package_key [ad_conn package_key]
 
-set context_bar [ad_context_bar "Versions"]
+set context_bar [ad_context_bar "[_ bug-tracker.Versions]"]
 
 set version_add_url "version-ae?[export_vars -url { { return_url "versions" } }]"