diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox.xml
index 97c85dbddcc9ede1066618c31b6a1c5e79c98461..4ba6747b4f8fc23439a762f3702f75329b73c379 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/CampaignModule_viewCampaignStatusList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -319,6 +316,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -337,11 +338,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision</string>
-                          <string>Request by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
@@ -531,6 +532,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Campaigns</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -546,11 +553,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
index de62d97bb134527244562487a1db65ff0b3d785a..51ba0484b642c796a8162e8e57d08243be96507a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_viewTicketList/listbox.xml
@@ -122,7 +122,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -135,7 +135,7 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_section_title</string>
@@ -147,7 +147,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>destination_title</string>
@@ -211,7 +211,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -228,7 +228,7 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_section_title</string>
@@ -236,7 +236,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>delivery.start_date</string>
@@ -254,7 +254,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -281,7 +281,7 @@
                     <value> <int>5</int> </value>
                 </item>
                 <item>
-                    <key> <string>lines</string> </key>
+                    <key>                 <string>lines</string> </key>
                     <value> <int>30</int> </value>
                 </item>
                 <item>
@@ -293,7 +293,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>search_columns</string> </key>
+                    <key>                 <string>search_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -306,7 +306,7 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_section_title</string>
@@ -318,7 +318,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>destination_title</string>
@@ -376,11 +376,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>ticket_selection</string> </value>
                 </item>
                 <item>
-                    <key> <string>sort_columns</string> </key>
+                    <key>                 <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -393,7 +393,7 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_section_title</string>
@@ -405,7 +405,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>destination_title</string>
@@ -467,7 +467,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Tickets</string> </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList/listbox.xml
index 8d82e363619efcf6b77f6bd117486dfdd135ab6c..b4d1b9ffcd5d55cce531e74d4620c18391510db7 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -345,11 +342,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -372,6 +369,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -394,11 +395,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -555,11 +556,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -608,11 +609,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -639,6 +640,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Meetings</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -677,11 +684,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -696,11 +700,8 @@
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox.xml
index 30a10579888753a3a974aeb95b4c734fd36a2fb9..3c2299c8c64ea9afa646df04a116df46ec2ce295 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/MeetingModule_viewMeetingStatusList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -319,6 +316,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -337,7 +338,7 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision</string>
-                          <string>Request by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>destination_title</string>
@@ -345,7 +346,7 @@
                         </tuple>
                         <tuple>
                           <string>source</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>start_date</string>
@@ -519,6 +520,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Meetings</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -534,11 +541,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox.xml
index 1d0946d3aa899e3fc42af0c3a79a1a3842046d4a..89fc7b94d61f203a930cb6b577205dd7fea0d16c 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityStatusList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -319,6 +316,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -337,11 +338,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision</string>
-                          <string>Request by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>source_decision</string>
@@ -519,6 +520,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Sale Opportunity</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -534,11 +541,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox.xml
index da1256e87912a95ee2251ba0381bd464d6afe998..5e0ee8a8ea6fc14684a3d38ea8bfffe6d900611c 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequestModule_viewSupportRequestStatusList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -319,6 +316,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -337,11 +338,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision</string>
-                          <string>Request by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source</string>
-                          <string>Handled by</string>
+                          <string>Handler</string>
                         </tuple>
                         <tuple>
                           <string>source_decision</string>
@@ -519,6 +520,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Support Request</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -534,11 +541,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log
index 1793d45dbf902adfec59d35601263deedb7f3d4f..2cbc06ab8ddc9c825d89f90457875b9976599973 100644
--- a/bt5/erp5_crm/bt/change_log
+++ b/bt5/erp5_crm/bt/change_log
@@ -1,3 +1,6 @@
+2008-09-07 yusei
+* Update English messages.
+
 2008-09-04 yusei
 * Update English messages.
 
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index f491e22fc0b16a23866d07d8a24461aad41ba50a..f1efb2054088985fad3cec9900b3f4a7561597b3 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-299
\ No newline at end of file
+300
\ No newline at end of file
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList/listbox.xml
index 8a2829f893bef1120f30ff2e1c75a889c96b158b..a4f9b3f79cab12c1882e437d0b5cb57255cb7b2a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ExpenseModule_viewExpenseList/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -305,6 +302,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -329,6 +332,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -351,11 +358,11 @@
                         </tuple>
                         <tuple>
                           <string>TotalBilliableQuantity</string>
-                          <string>Billiable Expense</string>
+                          <string>Billable Expense</string>
                         </tuple>
                         <tuple>
                           <string>TotalNonBilliableQuantity</string>
-                          <string>Non-Billiable Expense</string>
+                          <string>Non-Billable Expense</string>
                         </tuple>
                         <tuple>
                           <string>TotalQuantity</string>
@@ -446,6 +453,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -511,6 +522,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Project Reports</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -526,11 +543,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -545,11 +559,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml
index 1fafeba001cefd1adf028a6b50142298dc52318c..74ae3e6e832dd93e22fb65bb8d0513a728aedd48 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_addTaskFastInput/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -305,6 +302,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -323,11 +326,11 @@
                         </tuple>
                         <tuple>
                           <string>task_start_date</string>
-                          <string>Start Date</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>task_stop_date</string>
-                          <string>Stop Date</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>task_comment</string>
@@ -359,6 +362,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -369,11 +376,11 @@
                         </tuple>
                         <tuple>
                           <string>task_start_date</string>
-                          <string>Start Date</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>task_stop_date</string>
-                          <string>Stop Date</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>task_comment</string>
@@ -381,7 +388,7 @@
                         </tuple>
                         <tuple>
                           <string>task_requirement</string>
-                          <string>Requeriment</string>
+                          <string>Requirement</string>
                         </tuple>
                       </list>
                     </value>
@@ -432,11 +439,11 @@
                         </tuple>
                         <tuple>
                           <string>task_start_date</string>
-                          <string>Start Date</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>task_stop_date</string>
-                          <string>Stop Date</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>task_comment</string>
@@ -444,7 +451,7 @@
                         </tuple>
                         <tuple>
                           <string>task_requirement</string>
-                          <string>Requeriment</string>
+                          <string>Requirement</string>
                         </tuple>
                       </list>
                     </value>
@@ -556,6 +563,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Tasks</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -571,11 +584,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml
index 3678746022c6554eb1c87f12b2125d3144e2a6bf..2ec16ac6e9c5cc3a3a3af39320a05632a0654916 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewReport/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -313,6 +310,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -333,6 +336,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -347,7 +354,7 @@
                         </tuple>
                         <tuple>
                           <string>getStartDate</string>
-                          <string>Beginning Date</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>getStopDate</string>
@@ -440,6 +447,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>page_template</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>portal_types</string> </key>
                     <value>
@@ -500,6 +511,12 @@
                     <key> <string>title</string> </key>
                     <value> <string>Works</string> </value>
                 </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
@@ -515,11 +532,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
index ea5b0b10b440e6bfaa401d1441cf23639f3ad131..1128bf78d272fe1f2ffb2d74ed60bf7be9727943 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewTaskList/listbox.xml
@@ -111,6 +111,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -120,7 +126,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -137,11 +143,11 @@
                         </tuple>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>delivery.stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -182,7 +188,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -199,11 +205,11 @@
                         </tuple>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>delivery.stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -221,7 +227,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>default_params</string> </key>
+                    <key>                 <string>default_params</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -232,16 +238,16 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>delivery.stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -255,13 +261,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>portal_types</string> </key>
+                    <key>                 <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -272,7 +278,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>project_task_selection</string> </value>
                 </item>
                 <item>
@@ -280,7 +286,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Tasks</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
index f6eecfad7f8cfbc303072d43798b5fadc774f98f..85fd0f8656406b9b43db77d22079049b16c6b721 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewDetailedReportMacro.xml
@@ -167,6 +167,12 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
index 20267b038e47789f406f206e20366afd6b601b7b..335d630606816041508b3457bd906410c24fe427 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewMilestone/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -16,19 +13,17 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>all_columns</string>
-                <string>all_editable_columns</string>
                 <string>title</string>
-                <string>report_tree</string>
-                <string>report_root_list</string>
-                <string>selection_name</string>
+                <string>lines</string>
                 <string>columns</string>
-                <string>Base_viewSearchResultList</string>
+                <string>all_columns</string>
                 <string>sort</string>
+                <string>selection_name</string>
+                <string>portal_types</string>
                 <string>editable_columns</string>
-                <string>lines</string>
+                <string>report_tree</string>
+                <string>report_root_list</string>
                 <string>list_action</string>
-                <string>portal_types</string>
               </list>
             </value>
         </item>
@@ -85,6 +80,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -94,7 +95,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -111,7 +112,7 @@
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -140,7 +141,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -157,13 +158,13 @@
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -176,7 +177,7 @@
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -190,15 +191,15 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>lines</string> </key>
+                    <key>                 <string>lines</string> </key>
                     <value> <int>10</int> </value>
                 </item>
                 <item>
-                    <key> <string>list_action</string> </key>
+                    <key>                 <string>list_action</string> </key>
                     <value> <string>Project_viewLineList</string> </value>
                 </item>
                 <item>
-                    <key> <string>portal_types</string> </key>
+                    <key>                 <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -213,7 +214,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_root_list</string> </key>
+                    <key>                 <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -224,15 +225,15 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_tree</string> </key>
+                    <key>                 <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>project_milestone_selection</string> </value>
                 </item>
                 <item>
-                    <key> <string>sort</string> </key>
+                    <key>                 <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -247,7 +248,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Project Milestones</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
index 77eeba113bb1e17dcee11bcce6f0ab9edf55893f..578ffab11c8dccd95e12f908f12764c04f147780 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewSummaryList/listbox.xml
@@ -79,6 +79,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -88,7 +94,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -109,7 +115,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned To</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -117,11 +123,11 @@
                         </tuple>
                         <tuple>
                           <string>initial_start_date</string>
-                          <string>Initial Begin</string>
+                          <string>Initial Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>initial_stop_date</string>
-                          <string>Initial End</string>
+                          <string>Initial End Date</string>
                         </tuple>
                         <tuple>
                           <string>initial_quantity</string>
@@ -129,11 +135,11 @@
                         </tuple>
                         <tuple>
                           <string>real_start_date</string>
-                          <string>Begin</string>
+                          <string>Real Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>real_stop_date</string>
-                          <string>End</string>
+                          <string>Real End Date</string>
                         </tuple>
                         <tuple>
                           <string>real_quantity</string>
@@ -174,7 +180,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -195,7 +201,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned To</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -203,11 +209,11 @@
                         </tuple>
                         <tuple>
                           <string>initial_start_date</string>
-                          <string>Estimated Begin</string>
+                          <string>Estimated Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>initial_stop_date</string>
-                          <string>Estimated End</string>
+                          <string>Estimated End Date</string>
                         </tuple>
                         <tuple>
                           <string>initial_quantity</string>
@@ -215,11 +221,11 @@
                         </tuple>
                         <tuple>
                           <string>real_start_date</string>
-                          <string>Real Begin</string>
+                          <string>Real Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>real_stop_date</string>
-                          <string>Real End</string>
+                          <string>Real End Date</string>
                         </tuple>
                         <tuple>
                           <string>real_quantity</string>
@@ -237,7 +243,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -250,11 +256,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -268,13 +274,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>portal_types</string> </key>
+                    <key>                 <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -285,7 +291,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_root_list</string> </key>
+                    <key>                 <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -296,11 +302,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_tree</string> </key>
+                    <key>                 <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>project_task_report_selection</string> </value>
                 </item>
                 <item>
@@ -308,7 +314,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>stat_method</string> </key>
+                    <key>                 <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -318,7 +324,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Summary</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
index c0af0b4318416aa29f210512e11096f4c33aa632..75f9178505ee2a2f229bbec0e401616a2f5c4358 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
@@ -79,6 +79,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -88,7 +94,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -109,7 +115,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned To</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -117,11 +123,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -162,7 +168,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -191,11 +197,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -213,7 +219,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -226,11 +232,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -244,13 +250,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>portal_types</string> </key>
+                    <key>                 <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -261,7 +267,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_root_list</string> </key>
+                    <key>                 <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -272,11 +278,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_tree</string> </key>
+                    <key>                 <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>project_task_selection</string> </value>
                 </item>
                 <item>
@@ -284,7 +290,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>stat_method</string> </key>
+                    <key>                 <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -294,7 +300,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Tasks</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
index 3dd6d720aa677896de110bc9426fdf85e97da4b9..d0d05a36a2e15a51465710c95a7cdd7c7696b39c 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
@@ -79,6 +79,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -88,7 +94,7 @@
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>all_columns</string> </key>
+                    <key>                 <string>all_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -109,7 +115,7 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned To</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>resource_title</string>
@@ -117,11 +123,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -162,7 +168,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -191,11 +197,11 @@
                         </tuple>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                         <tuple>
                           <string>quantity</string>
@@ -213,16 +219,16 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>start_date</string>
-                          <string>Begin</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -236,13 +242,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>portal_types</string> </key>
+                    <key>                 <string>portal_types</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -253,7 +259,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_root_list</string> </key>
+                    <key>                 <string>report_root_list</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -264,11 +270,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>report_tree</string> </key>
+                    <key>                 <string>report_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>project_task_report_selection</string> </value>
                 </item>
                 <item>
@@ -276,7 +282,7 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>stat_method</string> </key>
+                    <key>                 <string>stat_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -286,7 +292,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string>Task Reports</string> </value>
                 </item>
               </dictionary>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_cleanupDescription.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_cleanupDescription.xml
index e98b61b2fef800b68f67b3dd860a4fbd4baa8cf7..60f257c4724c4ec31283967e7a54edc489048914 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_cleanupDescription.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_cleanupDescription.xml
@@ -93,7 +93,7 @@ cleanupDescription(context)\n
 \n
 return context.Base_redirect(form_id,\n
   keep_items=dict(portal_status_message=\n
-                     context.Base_translateString(\'Descriptions cleaned up\')))\n
+                     context.Base_translateString(\'Descriptions cleaned up.\')))\n
 
 
 ]]></string> </value>
@@ -164,6 +164,12 @@ return context.Base_redirect(form_id,\n
             <key> <string>id</string> </key>
             <value> <string>RequirementDocument_cleanupDescription</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
index 932c6ca52881e6306076cedb145804ddef390f82..e0a9a22341060a995704171b035b196639807dda 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/RequirementDocument_viewOrphanedReport/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ProxyField</string>
-          <string>ProxyField</string>
-        </tuple>
-        <none/>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -16,11 +13,10 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>all_editable_columns</string>
                 <string>title</string>
-                <string>selection_name</string>
                 <string>columns</string>
                 <string>list_method</string>
+                <string>selection_name</string>
               </list>
             </value>
         </item>
@@ -77,6 +73,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -88,7 +90,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -115,13 +117,13 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>orphaned_requirement_selection</string> </value>
                 </item>
                 <item>
@@ -129,8 +131,8 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Listbox</string> </value>
+                    <key>                 <string>title</string> </key>
+                    <value> <string>Requirements</string> </value>
                 </item>
               </dictionary>
             </value>
@@ -141,11 +143,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
index 46092f508d4aceb30e5f92987e011bc3d2cfbaf6..ee94829821eb579f6b99de48521220ee4caae04a 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput.xml
@@ -46,6 +46,16 @@
             <key> <string>action</string> </key>
             <value> <string>Requirement_generateRequirements</string> </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>
@@ -124,7 +134,13 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Add Document With Requirements</string> </value>
+            <value> <string>Add Document with Requirements</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml
index f8ccbdcd972095a97751daa5f5e70640d9b2ca45..09756fe9b72f2bafbee0c45c1b3d3ab65bd2dc87 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Requirement_addDocumentFastInput/listbox.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.ListBox</string>
-          <string>ListBox</string>
-        </tuple>
-        <none/>
+        <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -305,6 +302,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -355,6 +358,10 @@
                     <key> <string>alternate_name</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>anchor</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>columns</string> </key>
                     <value>
@@ -538,7 +545,13 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Requirements With Sub-Requirements</string> </value>
+                    <value> <string>Requirements with Sub-Requirements</string> </value>
+                </item>
+                <item>
+                    <key> <string>untranslatable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
@@ -555,11 +568,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.MethodField</string>
-          <string>Method</string>
-        </tuple>
-        <none/>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
index e4905a627a6a6382e31a722d22354958355212c0..0e825d5fe4bc9a56c418fd6341bd1a6992eb5b58 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
@@ -82,6 +82,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -112,11 +118,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned to</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>destination_title</string>
@@ -227,11 +233,11 @@
                       <list>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Starting</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>delivery.stop_date</string>
-                          <string>Due</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -300,11 +306,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned to</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>translated_simulation_state_title</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
index 99b4a5f1f4b92dd191b23060d06f533020a1f0bc..209e7c2a6711002486ca5d9520e9803faee96937 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
@@ -81,6 +81,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -115,11 +121,11 @@
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned to</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested By</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>total_quantity</string>
@@ -222,11 +228,11 @@
                       <list>
                         <tuple>
                           <string>delivery.start_date</string>
-                          <string>Starting</string>
+                          <string>Begin Date</string>
                         </tuple>
                         <tuple>
                           <string>delivery.stop_date</string>
-                          <string>Due</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -295,11 +301,11 @@
                         </tuple>
                         <tuple>
                           <string>destination_decision_title</string>
-                          <string>Requested by</string>
+                          <string>Requester</string>
                         </tuple>
                         <tuple>
                           <string>source_title</string>
-                          <string>Assigned to</string>
+                          <string>Assignee</string>
                         </tuple>
                         <tuple>
                           <string>translated_simulation_state_title</string>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
index 3a0de43ce65cce4edecac78e35e14c173344a61b..f0d11dc641c6992c77957cab84da899b3656f5cc 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_viewDetailedReportAsOdt.xml
@@ -101,7 +101,7 @@ AAA=</string> </value>
           </text:p>\n
           \n
           <text:p text:style-name=\'Project_20_Box\'>\n
-            <text:span text:style-name=\'T1\' i18n:translate="Assigned to" i18n:domain="erp5_ui">Assigned to</text:span>: <tal:block tal:replace="task/getSourceTitle">2006-01-01</tal:block><text:tab/>\n
+            <text:span text:style-name=\'T1\' i18n:translate="Assignee" i18n:domain="erp5_ui">Assignee</text:span>: <tal:block tal:replace="task/getSourceTitle">2006-01-01</tal:block><text:tab/>\n
           </text:p>\n
   \n
           <text:p text:style-name=\'Text_20_body\' tal:content="task/getComment">Description of project line.</text:p>\n
@@ -138,6 +138,12 @@ AAA=</string> </value>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
index df79dedaa6240cf01526b1d7f31b6f8adab847c2..8081acea5ef77b639dec2cc3520e8d24417c8722 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Task_calculateDuplication.xml
@@ -124,17 +124,20 @@ def getDatePeriodList(start_date):\n
 start_date = context.getStartDate()\n
 if start_date is None:\n
   return context.REQUEST.RESPONSE.redirect(\n
-    \'%s?portal_status_message=%s+%s.\' % (context.absolute_url(), \n
-                                         Base_translateString(\'Tasks+can+not+be+created:\'), \n
-                                         Base_translateString(\'Start+Date+is+None\')))\n
+    \'%s?portal_status_message=%s\' % (\n
+    context.absolute_url(),\n
+    Base_translateString(\'Tasks can not be created, start date is empty.\')\n
+    ))\n
 else:\n
   date_list = getDatePeriodList(start_date)\n
   for next_date in date_list:\n
     context.activate(activity="SQLQueue").Task_duplicate(next_date)\n
   return context.REQUEST.RESPONSE.redirect(\n
-    \'%s?portal_status_message=%s+%s.\' % (context.absolute_url(), \n
-                                         len(date_list), \n
-                                         Base_translateString(\'Tasks+created\')))\n
+    \'%s?portal_status_message=%s\' % (\n
+    context.absolute_url(),\n
+    Base_translateString(\'${count} tasks created.\',\n
+                         mapping={\'count\':len(date_list)})\n
+    ))\n
 
 
 ]]></string> </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox.xml
index 6190dfa852dec667c1737bded5bebc93134515f8..8126db9bff36bc8376715fcc930f5e5b9a8a1d88 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrder_viewMilestone/listbox.xml
@@ -76,6 +76,12 @@
               </dictionary>
             </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>values</string> </key>
             <value>
@@ -121,7 +127,7 @@
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
@@ -136,7 +142,7 @@
                         </tuple>
                         <tuple>
                           <string>stop_date</string>
-                          <string>End</string>
+                          <string>End Date</string>
                         </tuple>
                       </list>
                     </value>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/1_draft_project.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/1_draft_project.xml
index 9814286761c86da25bdf86fff6df2461cd9a64cd..cf982dd6222f654622f29965c84816003e70562d 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/1_draft_project.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/1_draft_project.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Project to open (%(count)s)</string> </value>
+            <value> <string>Project to Open (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ project_module?validation_state=draft&portal_type=%(portal_type)s&local_roles=%(
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Project to open</string> </value>
+            <value> <string>Project to Open</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/2_suspended_project.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/2_suspended_project.xml
index 3d9bb69a0617b41510fba637254d6bacd80d80c6..6b8eff029ec5297f54a2bfa06c083d9dcbf12cec 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/2_suspended_project.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/worklists/2_suspended_project.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Project to resume (%(count)s)</string> </value>
+            <value> <string>Project to Resume (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ project_module?validation_state=suspended&portal_type=%(portal_type)s&local_role
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Project to resume</string> </value>
+            <value> <string>Project to Resume</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
index da7b009c57eb5e79deb8efee6b0dca683b886e62..d0049804c9a9e9fb624a7d5e9af8a5991267722f 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/plan_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Ask for more details</string> </value>
+            <value> <string>Ask for More Details</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
index 1424965041ef1a0715c15431219ba1606a5a338d..d160b8898177a2875a07df4c44e047a86e98b889 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/start_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Start to work on it</string> </value>
+            <value> <string>Start to Work on It</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
index 455ce3eca3c2f6e24ae80765526a3b16045d787a..27d663c1ef2acf84a194429b1680c75957929728 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/transitions/stop_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Finish the work</string> </value>
+            <value> <string>Finish the Work</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
index e0eab6603e66f064c599d7049d7178c872ec1de8..1dc1811801c6ee29e092b3073d214b62bc4ffee3 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/accept_decision_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Accept decision</string> </value>
+            <value> <string>Accept Decision</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -88,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
index 88d0b2d5a43d0c6a174cbd9577728e12516ffa60..51ab97c6e10e5ac2dd5314d6bb149e6ce47644bc 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_causality_workflow/transitions/adopt_prevision_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Adopt prevision</string> </value>
+            <value> <string>Adopt Prevision</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -67,11 +67,8 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -88,11 +85,8 @@
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
index 5097c319ec0854ca14de43e636039f46585683bc..02857082d796ff3aa304a04f1bb3e86e63cbc0de 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Tasks to validate (%(count)s)</string> </value>
+            <value> <string>Tasks to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ task_module?simulation_state=draft&local_roles=%(local_roles)s&reset=1
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Tasks to validate</string> </value>
+            <value> <string>Tasks to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
index 18aa0a9583d3e47035d6bef9aa70c2723e12d3cf..4f059a1a5efd216ec7f0ed63495b4299f83b8086 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Tasks to order (%(count)s)</string> </value>
+            <value> <string>Tasks to Order (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ task_module?simulation_state=planned&local_roles=%(local_roles)s&reset=1
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Planned tasks to review</string> </value>
+            <value> <string>Tasks to Order</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
index 52ee68ceaec026456af62d76a6f08cae2ce81ea3..eb5e26d4f15aa889e1fae25cb6d47c7aa8edc6a7 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Tasks to confirm (%(count)s)</string> </value>
+            <value> <string>Tasks to Confirm (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ task_module?simulation_state=ordered&local_roles=%(local_roles)s&reset=1
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Ordered tasks to review</string> </value>
+            <value> <string>Tasks to Confirm</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_project/bt/change_log b/bt5/erp5_project/bt/change_log
index b80a5372ca02dcf0688f80ebd7caa3b78f5bc3af..36f15a95fa7736be08a79a1be9e304109c05e80e 100644
--- a/bt5/erp5_project/bt/change_log
+++ b/bt5/erp5_project/bt/change_log
@@ -1,3 +1,6 @@
+2008-09-07 yusei
+* Update English messages.
+
 2008-08-28 yusei
 * Use Base_translateString or translateString instead of N_ for translation message.
 
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 9d0f8afde3ef28a15d12427a8d96dd43d6952fd9..bccc87b80ef7af97083b3cda3f315937e89f1673 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-578
\ No newline at end of file
+581
\ No newline at end of file