diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
index 575c2b9facb88dc1c9053ca96f7363f6a2f690ce..6ad3605c5b7e2e86d51b0329d6ecc5b58e8c88be 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewStockReportBySite/listbox.xml
@@ -107,7 +107,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -134,7 +134,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -153,21 +153,21 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key> <string>lines</string> </key>
+                    <key>                 <string>lines</string> </key>
                     <value> <int>0</int> </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>stock_report_selection</string> </value>
                 </item>
                 <item>
-                    <key> <string>sort_columns</string> </key>
+                    <key>                 <string>sort_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -182,8 +182,8 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Stock By Variation</string> </value>
+                    <key>                 <string>title</string> </key>
+                    <value> <string>Stock by Variation</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
index d85949e427e65169e6781cfe357ec90268ca7a31..03e720e70004542155a7745d2d03cea9ca3da634 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
@@ -72,7 +72,7 @@ packing_list = context\n
 # Modify state\n
 packing_list_state = packing_list.getSimulationState()\n
 if packing_list_state == "draft":\n
-  packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder\'))\n
+  packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder.\'))\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
index 30252b2d827e2e7f2a2addd4a6d226402370e919..e106509d620de112bb37815f0c8809be526fa0b9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewDivergence/listbox.xml
@@ -322,17 +322,21 @@
                     <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>
                       <list>
                         <tuple>
                           <string>property_tester</string>
-                          <string>property_tester</string>
+                          <string>Property Tester</string>
                         </tuple>
                         <tuple>
                           <string>solver_list</string>
-                          <string>solver_list</string>
+                          <string>Solver List</string>
                         </tuple>
                       </list>
                     </value>
@@ -475,7 +479,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>listbox</string> </value>
+                    <value> <string>Divergence Messages</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
@@ -492,11 +496,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_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
index 4ae28dbe1d14158faf587f9a21abf08e338c1d9c..3b86a45a14de057e62a4d72e7ad34b18934db8bc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_viewInventory/listbox.xml
@@ -188,7 +188,7 @@
                 </item>
                 <item>
                     <key>                 <string>title</string> </key>
-                    <value> <string>Stock By Variation</string> </value>
+                    <value> <string>Stock by Variation</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
index 6dc599559e80d05bd0adb44a1f3d03c172ddb824..d867918bb34c94baff613250081cc8529dda886e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
@@ -97,7 +97,7 @@ while count > 0 and len(trade_condition_list) == 0:\n
 \n
 if len(trade_condition_list ) == 0 :\n
   redirect_url = \'%s/%s?%s\' % ( context.absolute_url(), form_id,\n
-      \'portal_status_message=\' + Base_translateString(\'No Trade Condition.\'))\n
+      \'portal_status_message=\' + Base_translateString(\'No trade condition.\'))\n
 else :\n
   # if more than one trade condition is found, simply apply the first one\n
   trade_condition=trade_condition_list[0].getObject()\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
index a14f1574d8ad13320154eb5e860914bf1538f255..54f974a8fe4977bc24e49266a379c41648981470 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
@@ -97,7 +97,7 @@ while count > 0 and len(trade_condition_list) == 0:\n
 \n
 if len(trade_condition_list ) == 0 :\n
   redirect_url = \'%s/%s?%s\' % ( context.absolute_url(), form_id,\n
-      \'portal_status_message=\' + Base_translateString(\'No Trade Condition.\'))\n
+      \'portal_status_message=\' + Base_translateString(\'No trade condition.\'))\n
 else :\n
   # if more than one trade condition is found, simply apply the first one\n
   trade_condition=trade_condition_list[0].getObject()\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
index 6ae49ad4718e7a19397ba5f8591f94b1c6ca40d1..f6e1c3239470d925b6d66a7de2950c64eeac31da 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
@@ -79,7 +79,7 @@ packing_list.PackingList_copyOrderProperties()\n
 packing_list_state = packing_list.getSimulationState()\n
 \n
 if packing_list_state == "draft":\n
-  packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder\'))\n
+  packing_list.confirm(comment=translateString(\'Initialized by Delivery Builder.\'))\n
 \n
 # First set the packing_list in the building state\n
 packing_list.startBuilding()\n
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/1_draft_purchase_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/1_draft_purchase_order_list.xml
index d0ede9f272860d2f9cf20e3c9bb24da00249de7e..f6fa67eb8ea80ca292c76227b2dd225cf94401db 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/1_draft_purchase_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/1_draft_purchase_order_list.xml
@@ -33,7 +33,7 @@ purchase_order_module/view?simulation_state=draft&portal_type=Purchase+Order&loc
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Purchase Orders to Plan</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/2_auto_planned_purchase_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/2_auto_planned_purchase_order_list.xml
index da54ac8b4efb54e5750187e7b54bc01cd8912849..0ed65938fc7b153204224ab6a8786c4f9621c5c6 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/2_auto_planned_purchase_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/2_auto_planned_purchase_order_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Purchase proposals to approve (%(count)s)</string> </value>
+            <value> <string>Purchase Proposals to Approve (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ purchase_order_module/view?simulation_state=auto_planned&portal_type=Purchase+Or
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Purchase Proposals to Approve</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/3_planned_purchase_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/3_planned_purchase_order_list.xml
index 5eceea61947f8f4e041fcb17fb79bdfa9ada8b58..67fbbee58e539f32b13cb909e27a7edbc670a290 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/3_planned_purchase_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/3_planned_purchase_order_list.xml
@@ -33,7 +33,7 @@ purchase_order_module/view?simulation_state=planned&portal_type=Purchase+Order&l
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Purchase Orders to Order</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4_ordered_purchase_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4_ordered_purchase_order_list.xml
index d99b63eb942058d49e3332a2b8d7091055df2cda..589849d5f8c183589647e0500f537689f0e63f23 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4_ordered_purchase_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4_ordered_purchase_order_list.xml
@@ -33,7 +33,7 @@ purchase_order_module/view?simulation_state=ordered&portal_type=Purchase+Order&l
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Purchase Orders to Confirm</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4b_offered_purchase_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4b_offered_purchase_order_list.xml
index 86fb4b07e62438ad59f2b9e9833f2004110727fe..bc8cd76ddeaca6655ee9105d230a9096cb369fec 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4b_offered_purchase_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/4b_offered_purchase_order_list.xml
@@ -33,7 +33,7 @@ purchase_order_module/view?simulation_state=offered&portal_type=Purchase+Order&l
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Offered Purchase Orders to Follow</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/5_draft_sale_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/5_draft_sale_order_list.xml
index 131dc43eb0c0f0d0a65dd8a213c28581878b6240..12363527bc191c3a36394fc969cd1fc66c7b4521 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/5_draft_sale_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/5_draft_sale_order_list.xml
@@ -33,7 +33,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Sale+Order&local_roles
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Sale Orders to Plan</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/6_auto_planned_sale_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/6_auto_planned_sale_order_list.xml
index fcaff1ac5b4b52e01d0ec6ec0f74ae7fb20cae9a..6fa202e4ee03995f180f7ec92bd7fc50102375b2 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/6_auto_planned_sale_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/6_auto_planned_sale_order_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Sale proposals to approve  (%(count)s)</string> </value>
+            <value> <string>Sale Proposals to Approve  (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ sale_order_module/view?simulation_state=draft&portal_type=Sale+Order&local_roles
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Sale Proposals to Approve</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/7_planned_sale_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/7_planned_sale_order_list.xml
index 07255a10e92a81bd3ae5ac5c74b2069a8a059380..f7b227c49d9faef149a27ab62af3119febd5bf5a 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/7_planned_sale_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/7_planned_sale_order_list.xml
@@ -33,7 +33,7 @@ sale_order_module/view?simulation_state=planned&portal_type=Sale+Order&local_rol
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Sale Orders to Order</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/8_ordered_sale_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/8_ordered_sale_order_list.xml
index 2c8fdc0cec257ec90226a58d8d73168570544fa3..eb040d7c617d8307c8efa943efc149e585e28857 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/8_ordered_sale_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/8_ordered_sale_order_list.xml
@@ -33,7 +33,7 @@ sale_order_module/view?simulation_state=ordered&portal_type=Sale+Order&local_rol
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Sale Orders to Confirm</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/9_offered_sale_order_list.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/9_offered_sale_order_list.xml
index 83ac42749935cb5d02fbcccd6b271db809bd44bd..46d9dfd8d8bdbbd6042f752281dc8bd12f5b15e4 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/9_offered_sale_order_list.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/worklists/9_offered_sale_order_list.xml
@@ -33,7 +33,7 @@ sale_order_module/view?simulation_state=offered&portal_type=Sale+Order&local_rol
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Offered Sale Orders to Follow</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
index b0d73395cc7077f4b18576b7df2ec5ea9576f549..71738768d67d532b54a82c211aaf84b8d1572027 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/transitions/update_quantity_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Update quantity from container</string> </value>
+            <value> <string>Update Quantity from Container</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
index 2a1dd4c8bee6f6d001767e49cd54327c4fce5b60..0ef274f369aad81bdbf1d2460b4f358fec759949 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Set ready</string> </value>
+            <value> <string>Set Ready</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index 61555b903f42946cb7d2a8a11d024474b717f84b..ba643688d99449185595e07c461e1b0b576265ac 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2008-09-04 yusei
+* Update English messages.
+
 2008-08-29 yusei
 * Correct text.
 
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 7ad80225027a26278893c2ea0e8f1b2bae19b6dd..6efca19ea0b6814902678d61d3b643d78797c000 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-480
\ No newline at end of file
+481
\ No newline at end of file