Index: openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/generate-xml.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp	18 Mar 2004 09:48:00 -0000	1.2.2.1
+++ openacs-4/contrib/packages/simulation/www/citybuild/generate-xml.adp	22 Mar 2004 15:27:25 -0000	1.2.2.2
@@ -14,7 +14,7 @@
 </else>
 
 <if @result.errors@ not nil>
-#simulation.lt_The_following_errors_#
+#simulation.lt_The_following_errors#
 
 <pre>
 @error_text@
Index: openacs-4/contrib/packages/simulation/www/citybuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/citybuild/Attic/index.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/contrib/packages/simulation/www/citybuild/index.adp	18 Mar 2004 09:48:00 -0000	1.6.2.1
+++ openacs-4/contrib/packages/simulation/www/citybuild/index.adp	22 Mar 2004 15:27:25 -0000	1.6.2.2
@@ -10,10 +10,10 @@
 
   <ul class="action-links">
     <if @subscribe_url@ not nil>
-      <li><a href="@subscribe_url@">#simulation.lt_Notify_me_of_changes_#</a></li>
+      <li><a href="@subscribe_url@">#simulation.lt_Notify_me_of_changes#</a></li>
     </if>
     <if @unsubscribe_url@ not nil>
-      <li><a href="@unsubscribe_url@">#simulation.lt_Stop_notifying_me_of_#</a></li>
+      <li><a href="@unsubscribe_url@">#simulation.lt_Stop_notifying_me_of#</a></li>
     </if>
     <li><a href="map-xml">#simulation.View_Map_XML#</a></li>
     <li><a href="generate-xml">#simulation.lt_Generate_Map_XML_file#</a></li>
Index: openacs-4/contrib/packages/simulation/www/simbuild/task-details.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/task-details.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/simulation/www/simbuild/task-details.adp	18 Mar 2004 09:48:01 -0000	1.2.2.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/task-details.adp	22 Mar 2004 15:27:26 -0000	1.2.2.2
@@ -15,7 +15,7 @@
             <if @parent_action_url@ not nil>
               <li><a href="@parent_action_url@">#simulation.lt_Up_to_parent_task_arr#</a></li>
             </if>
-            <li><a href="@template_url@">#simulation.lt_Back_to_template_sim_#</a></li>
+            <li><a href="@template_url@">#simulation.lt_Back_to_template_sim#</a></li>
           </ul>
         </div>
       </div>
Index: openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simbuild/Attic/template-edit.adp,v
diff -u -r1.24.2.1 -r1.24.2.2
--- openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	18 Mar 2004 09:48:01 -0000	1.24.2.1
+++ openacs-4/contrib/packages/simulation/www/simbuild/template-edit.adp	22 Mar 2004 15:27:26 -0000	1.24.2.2
@@ -25,7 +25,7 @@
                   <li><a href="@inst_url@">#simulation.lt_Start_a_simulation_wi#</a></li>
                 </if>
               </else>
-              <li><a href="@spec_url@">#simulation.lt_Export_this_template_#</a></li>
+              <li><a href="@spec_url@">#simulation.lt_Export_this_template#</a></li>
               <li><a href="@delete_url@" onclick="return confirm('Are you sure you want to delete the template?');">#simulation.Delete_this_template#</a></li>
             </ul>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-characters.adp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	18 Mar 2004 09:48:02 -0000	1.13.2.1
+++ openacs-4/contrib/packages/simulation/www/siminst/map-characters.adp	22 Mar 2004 15:27:27 -0000	1.13.2.2
@@ -1,5 +1,5 @@
 <p>
-  #simulation.lt_Select_from_existing_# 
+  #simulation.lt_Select_from_existing# 
   <a href="../citybuild/object-edit?content_type=sim_character">#simulation.add_new_characters#</a> #simulation.lt_and_refresh__this_pag#  
 </p>
 
Index: openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/siminst/Attic/map-tasks.adp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	18 Mar 2004 09:48:02 -0000	1.13.2.1
+++ openacs-4/contrib/packages/simulation/www/siminst/map-tasks.adp	22 Mar 2004 15:27:27 -0000	1.13.2.2
@@ -1,6 +1,6 @@
 <if @missing_props_p@>
 
-  <div class="general-message">#simulation.lt_Some_of_the_tasks_of_# <a href="../citybuild/object-edit?content_type=sim_prop">#simulation.Create_props#</a> #simulation.lt_in_CityBuild_before_y#</div>
+  <div class="general-message">#simulation.lt_Some_of_the_tasks_of# <a href="../citybuild/object-edit?content_type=sim_prop">#simulation.Create_props#</a> #simulation.lt_in_CityBuild_before_y#</div>
 
 </if>
 <else>
Index: openacs-4/contrib/packages/simulation/www/simplay/cast.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/cast.adp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/cast.adp	18 Mar 2004 09:48:05 -0000	1.8.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/cast.adp	22 Mar 2004 15:27:27 -0000	1.8.2.2
@@ -4,7 +4,7 @@
 
 <if @already_cast_p@>
   <p>
-    #simulation.lt_You_are_already_cast_#
+    #simulation.lt_You_are_already_cast#
   </p>
  
   <listtemplate name="cast_info"></listtemplate></p>
@@ -34,7 +34,7 @@
 
 <if @join_new_case_url@ not nil>
   <ul class="action-links">
-    <li><a href="@join_new_case_url@">#simulation.lt_Be_the_first_user_in_#</a></li>
+    <li><a href="@join_new_case_url@">#simulation.lt_Be_the_first_user_in#</a></li>
   </ul>
 </if>
 
Index: openacs-4/contrib/packages/simulation/www/simplay/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/index.adp,v
diff -u -r1.23.2.1 -r1.23.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/index.adp	18 Mar 2004 09:48:05 -0000	1.23.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/index.adp	22 Mar 2004 15:27:27 -0000	1.23.2.2
@@ -7,7 +7,7 @@
 
 <if @adminplayer_p@ true>
 <h3>#simulation.Administration#</h3>
-  <h3>#simulation.lt_You_administer_these_#</h3>
+  <h3>#simulation.lt_You_administer_these#</h3>
 
   <include src="/packages/simulation/lib/cases-admin"/>
   <p></p>
Index: openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/task-detail.adp,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	18 Mar 2004 09:48:05 -0000	1.10.2.3
+++ openacs-4/contrib/packages/simulation/www/simplay/task-detail.adp	22 Mar 2004 15:27:27 -0000	1.10.2.4
@@ -11,7 +11,7 @@
 
 <if @bulk_p@>
   <p>
-    #simulation.lt_You_are_doing_a_bulk_#
+    #simulation.lt_You_are_doing_a_bulk#
   </p>
 
   <if @ignored_actions_count@ gt 0>
Index: openacs-4/contrib/packages/simulation/www/simplay/tasks-bulk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/simplay/Attic/tasks-bulk.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/contrib/packages/simulation/www/simplay/tasks-bulk.adp	18 Mar 2004 09:48:05 -0000	1.1.2.1
+++ openacs-4/contrib/packages/simulation/www/simplay/tasks-bulk.adp	22 Mar 2004 15:27:27 -0000	1.1.2.2
@@ -5,5 +5,5 @@
   <include src="/packages/simulation/lib/tasks" workflow_id="@workflow_id@" &="role_id">
 
   <p>
-    #simulation.lt_If_you_are_using_the_#
+    #simulation.lt_If_you_are_using_the#
   </p>
Index: openacs-4/packages/simulation/www/citybuild/generate-xml.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/generate-xml.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/simulation/www/citybuild/generate-xml.adp	18 Mar 2004 09:48:00 -0000	1.2.2.1
+++ openacs-4/packages/simulation/www/citybuild/generate-xml.adp	22 Mar 2004 15:27:25 -0000	1.2.2.2
@@ -14,7 +14,7 @@
 </else>
 
 <if @result.errors@ not nil>
-#simulation.lt_The_following_errors_#
+#simulation.lt_The_following_errors#
 
 <pre>
 @error_text@
Index: openacs-4/packages/simulation/www/citybuild/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/citybuild/index.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/simulation/www/citybuild/index.adp	18 Mar 2004 09:48:00 -0000	1.6.2.1
+++ openacs-4/packages/simulation/www/citybuild/index.adp	22 Mar 2004 15:27:25 -0000	1.6.2.2
@@ -10,10 +10,10 @@
 
   <ul class="action-links">
     <if @subscribe_url@ not nil>
-      <li><a href="@subscribe_url@">#simulation.lt_Notify_me_of_changes_#</a></li>
+      <li><a href="@subscribe_url@">#simulation.lt_Notify_me_of_changes#</a></li>
     </if>
     <if @unsubscribe_url@ not nil>
-      <li><a href="@unsubscribe_url@">#simulation.lt_Stop_notifying_me_of_#</a></li>
+      <li><a href="@unsubscribe_url@">#simulation.lt_Stop_notifying_me_of#</a></li>
     </if>
     <li><a href="map-xml">#simulation.View_Map_XML#</a></li>
     <li><a href="generate-xml">#simulation.lt_Generate_Map_XML_file#</a></li>
Index: openacs-4/packages/simulation/www/simbuild/task-details.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/task-details.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/simulation/www/simbuild/task-details.adp	18 Mar 2004 09:48:01 -0000	1.2.2.1
+++ openacs-4/packages/simulation/www/simbuild/task-details.adp	22 Mar 2004 15:27:26 -0000	1.2.2.2
@@ -15,7 +15,7 @@
             <if @parent_action_url@ not nil>
               <li><a href="@parent_action_url@">#simulation.lt_Up_to_parent_task_arr#</a></li>
             </if>
-            <li><a href="@template_url@">#simulation.lt_Back_to_template_sim_#</a></li>
+            <li><a href="@template_url@">#simulation.lt_Back_to_template_sim#</a></li>
           </ul>
         </div>
       </div>
Index: openacs-4/packages/simulation/www/simbuild/template-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simbuild/template-edit.adp,v
diff -u -r1.24.2.1 -r1.24.2.2
--- openacs-4/packages/simulation/www/simbuild/template-edit.adp	18 Mar 2004 09:48:01 -0000	1.24.2.1
+++ openacs-4/packages/simulation/www/simbuild/template-edit.adp	22 Mar 2004 15:27:26 -0000	1.24.2.2
@@ -25,7 +25,7 @@
                   <li><a href="@inst_url@">#simulation.lt_Start_a_simulation_wi#</a></li>
                 </if>
               </else>
-              <li><a href="@spec_url@">#simulation.lt_Export_this_template_#</a></li>
+              <li><a href="@spec_url@">#simulation.lt_Export_this_template#</a></li>
               <li><a href="@delete_url@" onclick="return confirm('Are you sure you want to delete the template?');">#simulation.Delete_this_template#</a></li>
             </ul>
 
Index: openacs-4/packages/simulation/www/siminst/map-characters.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-characters.adp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/simulation/www/siminst/map-characters.adp	18 Mar 2004 09:48:02 -0000	1.13.2.1
+++ openacs-4/packages/simulation/www/siminst/map-characters.adp	22 Mar 2004 15:27:27 -0000	1.13.2.2
@@ -1,5 +1,5 @@
 <p>
-  #simulation.lt_Select_from_existing_# 
+  #simulation.lt_Select_from_existing# 
   <a href="../citybuild/object-edit?content_type=sim_character">#simulation.add_new_characters#</a> #simulation.lt_and_refresh__this_pag#  
 </p>
 
Index: openacs-4/packages/simulation/www/siminst/map-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/siminst/map-tasks.adp,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/simulation/www/siminst/map-tasks.adp	18 Mar 2004 09:48:02 -0000	1.13.2.1
+++ openacs-4/packages/simulation/www/siminst/map-tasks.adp	22 Mar 2004 15:27:27 -0000	1.13.2.2
@@ -1,6 +1,6 @@
 <if @missing_props_p@>
 
-  <div class="general-message">#simulation.lt_Some_of_the_tasks_of_# <a href="../citybuild/object-edit?content_type=sim_prop">#simulation.Create_props#</a> #simulation.lt_in_CityBuild_before_y#</div>
+  <div class="general-message">#simulation.lt_Some_of_the_tasks_of# <a href="../citybuild/object-edit?content_type=sim_prop">#simulation.Create_props#</a> #simulation.lt_in_CityBuild_before_y#</div>
 
 </if>
 <else>
Index: openacs-4/packages/simulation/www/simplay/cast.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/cast.adp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/simulation/www/simplay/cast.adp	18 Mar 2004 09:48:05 -0000	1.8.2.1
+++ openacs-4/packages/simulation/www/simplay/cast.adp	22 Mar 2004 15:27:27 -0000	1.8.2.2
@@ -4,7 +4,7 @@
 
 <if @already_cast_p@>
   <p>
-    #simulation.lt_You_are_already_cast_#
+    #simulation.lt_You_are_already_cast#
   </p>
  
   <listtemplate name="cast_info"></listtemplate></p>
@@ -34,7 +34,7 @@
 
 <if @join_new_case_url@ not nil>
   <ul class="action-links">
-    <li><a href="@join_new_case_url@">#simulation.lt_Be_the_first_user_in_#</a></li>
+    <li><a href="@join_new_case_url@">#simulation.lt_Be_the_first_user_in#</a></li>
   </ul>
 </if>
 
Index: openacs-4/packages/simulation/www/simplay/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/index.adp,v
diff -u -r1.23.2.1 -r1.23.2.2
--- openacs-4/packages/simulation/www/simplay/index.adp	18 Mar 2004 09:48:05 -0000	1.23.2.1
+++ openacs-4/packages/simulation/www/simplay/index.adp	22 Mar 2004 15:27:27 -0000	1.23.2.2
@@ -7,7 +7,7 @@
 
 <if @adminplayer_p@ true>
 <h3>#simulation.Administration#</h3>
-  <h3>#simulation.lt_You_administer_these_#</h3>
+  <h3>#simulation.lt_You_administer_these#</h3>
 
   <include src="/packages/simulation/lib/cases-admin"/>
   <p></p>
Index: openacs-4/packages/simulation/www/simplay/task-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/task-detail.adp,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/simulation/www/simplay/task-detail.adp	18 Mar 2004 09:48:05 -0000	1.10.2.3
+++ openacs-4/packages/simulation/www/simplay/task-detail.adp	22 Mar 2004 15:27:27 -0000	1.10.2.4
@@ -11,7 +11,7 @@
 
 <if @bulk_p@>
   <p>
-    #simulation.lt_You_are_doing_a_bulk_#
+    #simulation.lt_You_are_doing_a_bulk#
   </p>
 
   <if @ignored_actions_count@ gt 0>
Index: openacs-4/packages/simulation/www/simplay/tasks-bulk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/simplay/tasks-bulk.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/simulation/www/simplay/tasks-bulk.adp	18 Mar 2004 09:48:05 -0000	1.1.2.1
+++ openacs-4/packages/simulation/www/simplay/tasks-bulk.adp	22 Mar 2004 15:27:27 -0000	1.1.2.2
@@ -5,5 +5,5 @@
   <include src="/packages/simulation/lib/tasks" workflow_id="@workflow_id@" &="role_id">
 
   <p>
-    #simulation.lt_If_you_are_using_the_#
+    #simulation.lt_If_you_are_using_the#
   </p>