diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
index 6b4c61b2c6b81112a97c9c838c297c7b65240e00..c58c7732794ada1b6f8484d2c229641cd29b41c9 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/get_portal_type_properties.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Guess Properties Of Portal Types</string> </value>
+            <value> <string>Guess Properties of Portal Types</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
index 16402bb64fd641644b7cf89628731b7a9cba75cd..9e53749af35df6b37806e60e8c05b0f876d33312 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Business%20Template/guess_portal_types.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Guess Portal Types From Modules</string> </value>
+            <value> <string>Guess Portal Types from Modules</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
index cf38dfe3892f0f167741b2448abebdd52bb649bb..fb7e0b0e49d1e870cab0a274a465c680ddab9b30 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/diff.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Diff BusinessTemplate</string> </value>
+            <value> <string>Diff Business Template</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
index ba1c5c20ffc57456ed2475af09e3e5f3510cf4a0..9b63e4799a10283c27700ae4cfbba06b557f9853 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Download Business Template From URL</string> </value>
+            <value> <string>Download Business Template from URL</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
index 54c5b9404abdc600ab479dea588ebb10ee79179b..54603966e4774b466764905bc147d2ca3cc76881 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/download_from_repository.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Download Business Templates From Repositories</string> </value>
+            <value> <string>Download Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
index b171d538d431808d245a2c8f06e77958e91f4180..a3f24c47d6ed3d404ac04b1b94be42b8fda34838 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/install_from_repository.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Install Business Templates From Repositories</string> </value>
+            <value> <string>Install Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
index 5de9ff2edc69915747246059e61506e564fa3efe..8803b5bce9fc4fc62cbe645b14b9b669f28364e8 100644
--- a/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
+++ b/product/ERP5/bootstrap/erp5_core/ActionTemplateItem/portal_types/Template%20Tool/upgrade_from_repository.xml
@@ -55,7 +55,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Upgrade Business Templates From Repositories</string> </value>
+            <value> <string>Upgrade Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
index e16857c693053b7df9d230853bed8681b294defa..9b60d33f5d21347594f3e5a614a3dc7e794db2ec 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
@@ -226,7 +226,7 @@ if hasattr(kw, \'previous_md5_object_uid_list\'):\n
     object_uid_list = map(lambda x:x.getObject().getUid(), selection_list)\n
     error = context.portal_selections.selectionHasChanged(kw[\'previous_md5_object_uid_list\'], object_uid_list)\n
     if error:\n
-      error_message = context.Base_translateString("Sorry+your+selection+has+changed")\n
+      error_message = context.Base_translateString("Sorry,+your+selection+has+changed.")\n
 \n
 # if dialog_category is object_search, then edit the selection\n
 if dialog_category == "object_search" :\n
@@ -416,6 +416,12 @@ return request.RESPONSE.redirect(redirect_url)\n
             <key> <string>id</string> </key>
             <value> <string>Base_callDialogMethod</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doAction.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doAction.xml
index 970f7b5a299345380cc0b01d9d62495504480815..e9205dd78ffe993d6c78e1cfffb00329b8650d17 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doAction.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doAction.xml
@@ -103,7 +103,7 @@ elif doAction0 == \'add\':\n
   new_content = context.newContent(portal_type=type_name,\n
                                    container=context,\n
                                    id=str(new_id))\n
-  message = Base_translateString("Object+Created.")\n
+  message = Base_translateString("Object+created.")\n
   if not(ignore_layout) and context.getApplicableLayout():\n
     redirect_url = \'%s/%s?portal_status_message=%s&editable_mode=1\' % (\n
                               new_content.WebSite_getDocumentPhysicalPath()\n
@@ -128,9 +128,9 @@ elif doAction0 == \'template\':\n
     new_content.makeTemplateInstance()\n
     redirect_url = \'%s/%s?%s\' % ( new_content.absolute_url()\n
                             , \'view\'\n
-                            , \'portal_status_message=Template+Created.\')\n
-  else: \n
-    message = Base_translateString("Template+Does+not+Exist.")\n
+                            , \'portal_status_message=\'+Base_translateString(\'Template+created.\'))\n
+  else:\n
+    message = Base_translateString("Template+does+not+exist.")\n
     redirect_url = \'%s/%s?portal_status_message=%s\' % ( context.absolute_url()\n
                             , \'view\'\n
                             , message)\n
@@ -242,6 +242,12 @@ return getattr(context,form_id)(request)\n
             <key> <string>id</string> </key>
             <value> <string>Base_doAction</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
index cd489bd4bf899880cff27ebf7c54f1efe8fc5f0a..fc2252217283843c4eb41f81e71d4fa0690c53ee 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
@@ -234,7 +234,7 @@ def parseField(f):\n
 kw = {}\n
 encapsulated_editor_list = []\n
 MARKER = []\n
-message = Base_translateString("Data+Updated.")\n
+message = Base_translateString("Data+updated.")\n
 \n
 try:\n
   # We process all the field in form and\n
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.xml
index 61f534e27a145cbf739ecf3179dbc389d1628979..7f0e3bda5f443f3390616242c6f07779ae888c3d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editUnrestricted.xml
@@ -105,7 +105,7 @@ except FormValidationError, validation_errors:\n
 kw = {}\n
 encapsulated_editor_list = []\n
 MARKER = []\n
-message = Base_translateString("Data+Updated.")\n
+message = Base_translateString("Data+updated.")\n
 \n
 \n
 def parseField(f):\n
@@ -274,6 +274,12 @@ return request[\'RESPONSE\'].redirect(redirect_url)\n
             <key> <string>id</string> </key>
             <value> <string>Base_editUnrestricted</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getPrintModeItemList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getPrintModeItemList.xml
index 0dc1d5319bc28c0b09664c110005a255759fee18..a11439b62f714298db20b86de64f98e3266867c0 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getPrintModeItemList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getPrintModeItemList.xml
@@ -70,7 +70,7 @@
 return [\n
   (\'\', \'\'),\n
   (translateString(\'List of Documents\'), \'list\'),\n
-  (translateString(\'Default Print of each Document\'), \'list_view\'),\n
+  (translateString(\'Default Print of Each Document\'), \'list_view\'),\n
 ]\n
 </string> </value>
         </item>
@@ -140,6 +140,12 @@ return [\n
             <key> <string>id</string> </key>
             <value> <string>Base_getPrintModeItemList</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml
index 4ae3145e6b38d9c8abccb560b8a5149b5003d589..75d3db15ea22faee76521cecb184059494d49160 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_makeTemplateFromDocument.xml
@@ -85,7 +85,7 @@ template.makeTemplate()\n
 context.portal_caches.clearCacheFactory(\'erp5_ui_medium\')\n
 \n
 return context.Base_redirect(form_id,\n
-                             keep_items=dict(portal_status_message=context.Base_translateString("Templated Made.")),\n
+                             keep_items=dict(portal_status_message=context.Base_translateString("Templated made.")),\n
                              **kw)\n
 </string> </value>
         </item>
@@ -162,6 +162,12 @@ return context.Base_redirect(form_id,\n
             <key> <string>id</string> </key>
             <value> <string>Base_makeTemplateFromDocument</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.xml
index eb1ab30f6bb35ecee3fb1f7e55eba2e53d8c2438..baf9ca5cc98b80540753a0fa2c831af25722eb43 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateRelation.xml
@@ -254,7 +254,7 @@ except FormValidationError, validation_errors:\n
   request.set(\'field_errors\', field_errors)\n
   return form(request)\n
 else:\n
-  message = Base_translateString(\'Relation+Unchanged.\')\n
+  message = Base_translateString(\'Relation+unchanged.\')\n
 \n
 if redirect_url is None:\n
   if not selection_index:\n
@@ -388,6 +388,12 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
             <key> <string>id</string> </key>
             <value> <string>Base_validateRelation</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary.xml
index 1d6c2788b214583fa40d9ccc5638f25a01c2764a..931e96ade88f37e2716d71ac387dcfae2b75d515 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary.xml
@@ -56,6 +56,12 @@
             <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>
@@ -153,7 +159,13 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Default Field Library For Dialogs</string> </value>
+            <value> <string>Default Field Library for Dialogs</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml
index b78bbf057cfc9ea37e0741a19bf81becf9098ac9..fad910b38899a6dcc679efbbf7abda5e5f57c718 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string></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>
@@ -141,7 +151,13 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>View Files And Images</string> </value>
+            <value> <string>View Files and Images</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewReportFieldLibrary.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewReportFieldLibrary.xml
index 19ff057b89e622655ed5af65b92cb56636a329a3..27816568ad95bdfc34ae0e8fcb27b8a04e820f07 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewReportFieldLibrary.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewReportFieldLibrary.xml
@@ -50,6 +50,12 @@
             <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>
@@ -139,7 +145,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Default Field Library For Reports</string> </value>
+            <value> <string>Default Field Library for Reports</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CacheTool_viewCacheFactoryList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CacheTool_viewCacheFactoryList.xml
index 90d60a3da1cc5cf1f967bf7aa2d11b27d888ed8f..e28419e5acf4b32dc7435563192a1c6e5b27c879 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CacheTool_viewCacheFactoryList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CacheTool_viewCacheFactoryList.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string></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>
@@ -109,7 +119,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Cache factories list</string> </value>
+            <value> <string>Cache Factories List</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/listbox.xml
index c5b1ab733875805c0cbcb08697ad0ec93625f723..3b5f459c42116f6c19f4eddaa222ae57f32651d8 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/listbox.xml
@@ -121,7 +121,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -148,7 +148,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>default_params</string> </key>
+                    <key>                 <string>default_params</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -159,12 +159,12 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
                           <string>id</string>
-                          <string>Id</string>
+                          <string>ID</string>
                         </tuple>
                         <tuple>
                           <string>title</string>
@@ -190,25 +190,25 @@
                     <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>search</string> </key>
+                    <key>                 <string>search</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>select</string> </key>
+                    <key>                 <string>select</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>category_view_selection</string> </value>
                 </item>
                 <item>
-                    <key> <string>sort</string> </key>
+                    <key>                 <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -223,8 +223,8 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Sub Categories</string> </value>
+                    <key>                 <string>title</string> </key>
+                    <value> <string>Subcategories</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/my_reference.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/my_reference.xml
index 21917c880d8123010506cfe8d31c6e6a5b8f7a01..6c8c8d2d792c2e22a0f931c8ee25de1882585961 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/my_reference.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Category_viewFieldLibrary/my_reference.xml
@@ -87,7 +87,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Reference</string> </value>
                 </item>
               </dictionary>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
index cce5093ccebc304743dac466aeb9ea4d325273f4..f617cf0d6f3abaff09fe516b48d14caa2273ec40 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
@@ -77,7 +77,7 @@ request=context.REQUEST\n
 \n
 if uids != []:\n
   context.manage_copyObjects(uids=uids, REQUEST=request, RESPONSE=request.RESPONSE)\n
-  message = Base_translateString("Item(s)+Copied.")\n
+  message = Base_translateString("Item(s)+copied.")\n
 else:\n
   message = Base_translateString("Please+select+one+or+more+items+to+copy+first.")\n
 return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
@@ -162,6 +162,12 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?p
             <key> <string>id</string> </key>
             <value> <string>Folder_copy</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_create.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_create.xml
index 5b5226dc7e6290fe068d59926794c14f15f6c625..93ef12d5176af99e75429e3259a65a2a8b906710 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_create.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_create.xml
@@ -156,6 +156,12 @@ return REQUEST.RESPONSE.redirect(url)\n
             <key> <string>id</string> </key>
             <value> <string>Folder_create</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
index 6496b8cdca6b76463c77cdea176c52cfaf5d314b..27dbe9d286c073d2983acd3fe175ec24fe038aea 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
@@ -101,14 +101,14 @@ if uids != []:\n
 \n
   if object_used > 0:\n
     if object_used == 1:\n
-      message = Base_translateString("Sorry,+1+Item+Is+In+Use.")\n
+      message = Base_translateString("Sorry,+1+item+is+in+use.")\n
     else:\n
-      message = Base_translateString("Sorry,+${count}+Items+Are+In+Use.",\n
+      message = Base_translateString("Sorry,+${count}+items+are+in+use.",\n
                                      mapping={\'count\': repr(object_used)})\n
     qs = \'?portal_status_message=%s\' % message  \n
   else:\n
     context.manage_cutObjects(uids=uids, REQUEST=request)\n
-    message = Base_translateString("Item(s)+Cut.")\n
+    message = Base_translateString("Item(s)+cut.")\n
 else:\n
   message = Base_translateString("Please+select+one+or+more+items+to+cut+first.")\n
 return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
@@ -203,6 +203,12 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?p
             <key> <string>title</string> </key>
             <value> <string>Cut objects from a folder and copy to the clipboard</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
index 79cc537acd1b66ceceb58578c00e504bec039770..ab0bac061194274623a17a9eb63c140ad9aedb48 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml
@@ -101,7 +101,7 @@ def Object_hasRelation(obj):\n
 \n
 ret_url = context.absolute_url() + \'/\' + form_id\n
 if error:\n
-  message = Base_translateString("Sorry+your+selection+has+changed")\n
+  message = Base_translateString("Sorry,+your+selection+has+changed.")\n
   qs = \'?portal_status_message=%s\' % message\n
 elif uids is not None:\n
   # Check if there is some related objets.\n
@@ -112,9 +112,9 @@ elif uids is not None:\n
 \n
   if object_used > 0:\n
     if object_used == 1:\n
-      message = Base_translateString("Sorry,+1+Item+Is+In+Use.")\n
+      message = Base_translateString("Sorry,+1+item+is+in+use.")\n
     else:\n
-      message = Base_translateString("Sorry,+${count}+Items+Are+In+Use.",\n
+      message = Base_translateString("Sorry,+${count}+items+are+in+use.",\n
                                      mapping={\'count\': repr(object_used)})\n
     qs = \'?portal_status_message=%s\' % message  \n
   else:\n
@@ -177,10 +177,10 @@ elif uids is not None:\n
 \n
       # Generate message\n
       if not_deleted_count == 1:\n
-        message = Base_translateString("Sorry+You+Can+Not+Delete+${count}+Item.",\n
+        message = Base_translateString("Sorry,+you+can+not+delete+${count}+item.",\n
                                        mapping={\'count\': not_deleted_count})\n
       elif not_deleted_count > 1:\n
-        message = Base_translateString("Sorry+You+Can+Not+Delete+${count}+Items.",\n
+        message = Base_translateString("Sorry,+you+can+not+delete+${count}+items.",\n
                                        mapping={\'count\': not_deleted_count})\n
       qs = \'?portal_status_message=%s\' % message\n
 \n
@@ -319,6 +319,12 @@ return REQUEST.RESPONSE.redirect("%s%s" % (ret_url, qs))\n
             <key> <string>title</string> </key>
             <value> <string>Delete objects from a folder</string> </value>
         </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml
index 7b95bf12f14a98979b90ba5242b3c1d2427ad05d..434ca0c57a5c51567a54d4c4273b9584a715861f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog.xml
@@ -46,6 +46,16 @@
             <key> <string>action</string> </key>
             <value> <string>Folder_delete</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>
@@ -112,7 +122,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Delete The Objects</string> </value>
+            <value> <string>Delete Objects</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml
index 2be0cece7f374ef58152f42098649ea9b788ca26..3e67d92fb8f6de4a2977d348c2f51721ebb0c9df 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewDeleteDialog/listbox.xml
@@ -69,17 +69,17 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>anchor</string> </key>
+                    <key>                 <string>anchor</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
@@ -97,19 +97,19 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>search</string> </key>
+                    <key>                 <string>search</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>select</string> </key>
+                    <key>                 <string>select</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -117,7 +117,7 @@
                     <value> <string></string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
+                    <key>                 <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
               </dictionary>
@@ -138,11 +138,11 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>anchor</string> </key>
+                    <key>                 <string>anchor</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>columns</string> </key>
+                    <key>                 <string>columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -169,7 +169,7 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>editable_columns</string> </key>
+                    <key>                 <string>editable_columns</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -196,7 +196,7 @@
                     <value> <string>SEARCH_LIST</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_method</string> </key>
+                    <key>                 <string>list_method</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
                     </value>
@@ -206,15 +206,15 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>search</string> </key>
+                    <key>                 <string>search</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>select</string> </key>
+                    <key>                 <string>select</string> </key>
                     <value> <int>0</int> </value>
                 </item>
                 <item>
-                    <key> <string>selection_name</string> </key>
+                    <key>                 <string>selection_name</string> </key>
                     <value> <string>folder_delete_selection</string> </value>
                 </item>
                 <item>
@@ -222,8 +222,8 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Delete The Objects</string> </value>
+                    <key>                 <string>title</string> </key>
+                    <value> <string>Delete Objects</string> </value>
                 </item>
                 <item>
                     <key> <string>width</string> </key>
@@ -246,7 +246,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: field.getTemplateField().get_value(\'columns\') + [(\'related_object_list_quantity\', \'No. Related Objects\')]</string> </value>
+            <value> <string>python: field.getTemplateField().get_value(\'columns\') + [(\'related_object_list_quantity\', \'No related objects.\')]</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -262,7 +262,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: field.getTemplateField().get_value(\'editable_columns\') + [(\'related_object_list_quantity\', \'No. Related Objects\')]</string> </value>
+            <value> <string>python: field.getTemplateField().get_value(\'editable_columns\') + [(\'related_object_list_quantity\', \'No related objects.\')]</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml
index e5a4d96dedccb6f51fd24869a5c37298a8f07a17..448f83418e429f7dc69c9a5751517eec9c0fc437 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewDownloadRepositoryBusinessTemplateListDialog.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string>TemplateTool_downloadRepositoryBusinessTemplateList</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>
@@ -118,7 +128,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Download Business Templates From Repositories</string> </value>
+            <value> <string>Download Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml
index 7d7e8a0c0ce234809319a9217dbfda54667d20dc..cfc46127be7d574644a4afe41b4acc99b318755e 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewInstallRepositoryBusinessTemplateListDialog.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string>TemplateTool_installRepositoryBusinessTemplateList</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>
@@ -119,7 +129,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Install Business Templates From Repositories</string> </value>
+            <value> <string>Install Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml
index 895f01311690a868eaf12155d5e203629848b0b0..ee7104d8c435974a5d32703671425d97d3ded7ec 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_viewUpgradeRepositoryBusinessTemplateListDialog.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string>TemplateTool_installRepositoryBusinessTemplateList</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>
@@ -118,7 +128,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Upgrade Business Templates From Repositories</string> </value>
+            <value> <string>Upgrade Business Templates from Repositories</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml
index c34f282bca2ceebf8e4d3bed59f1bfdf2b355927..5737baa194ec2ce5a388c0a49ab96ccdc55c7c85 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml
@@ -52,6 +52,16 @@
             <key> <string>action</string> </key>
             <value> <string></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>
@@ -138,7 +148,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>List Objects In Trash Bin</string> </value>
+            <value> <string>List Objects in Trash Bin</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
index 7aaef195cf3e5762433ced75876d890d7d196149..e9f6f1fe01564e0effb42e06c129e269b3815392 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
@@ -83,7 +83,7 @@ for p in portal.portal_preferences.searchFolder(spec=(\'ERP5 Preference\',)) :\n
            \'disable_action\',\n
            wf_id=\'preference_workflow\', \n
            comment=translateString(\n
-          \'Automatically disabled when enabling ${preference_title}\',\n
+          \'Automatically disabled when enabling ${preference_title}.\',\n
           mapping={\'preference_title\': pref.getTitle()}))\n
   except \'Unauthorized\', a :\n
     LOG("not authorized to deactivate %s"%p)\n
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml
index ac89fd34417514bd8ef8908cd3a2a2888f708a55..84ca3e0e4b537ebcd51803b33355ca1c3340985e 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Persons to validate (%(count)s)</string> </value>
+            <value> <string>Persons to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Persons to validate</string> </value>
+            <value> <string>Persons to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml
index ca8a503e4e5deb00dbfc917a3aef4824573031d3..e4dd45c600c264b1a602db01cc3e33e76562007e 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Organisations to validate (%(count)s)</string> </value>
+            <value> <string>Organisations to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Organisations to validate</string> </value>
+            <value> <string>Organisations to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml
index b0f54f2d47e8960b91f730b67966fac6ee04a733..42e1c6c838fb2e39e5bfd290df336fa1665a86d2 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Purchase Trade Conditions to validate (%(count)s)</string> </value>
+            <value> <string>Purchase Trade Conditions to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ purchase_trade_condition_module/view?validation_state=draft&local_roles:list=Ass
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Purchase Trade Conditions to validate</string> </value>
+            <value> <string>Purchase Trade Conditions to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml
index bfa0078acbb9577ff7dffe686bd11e7ad16bf862..edfb9e4e836932ec5016307ab3fc0725fa4ffa94 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Products to validate (%(count)s)</string> </value>
+            <value> <string>Products to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ product_module/view?validation_state=draft&local_roles:list=Assignee&local_roles
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Products to validate</string> </value>
+            <value> <string>Products to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml
index 4914ca4fe1d1b9da07ebad1d211a7059d41d0b3f..593001af0ab5057695137c3f0050a6e0cf9806ab 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Services to validate (%(count)s)</string> </value>
+            <value> <string>Services to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ service_module/view?validation_state=draft&local_roles:list=Assignee&local_roles
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Services to validate</string> </value>
+            <value> <string>Services to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/6_draft_sale_trade_condition_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/6_draft_sale_trade_condition_list.xml
index 73eea23fdca5bd3c554a2beb8f7af9be3f7341ad..d243aca70975556c0dbd7c7d2b9673783394ce19 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/6_draft_sale_trade_condition_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/6_draft_sale_trade_condition_list.xml
@@ -21,7 +21,7 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Sale Trade Conditions to validate (%(count)s)</string> </value>
+            <value> <string>Sale Trade Conditions to Validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
@@ -33,7 +33,7 @@ sale_trade_condition_module/view?validation_state=draft&local_roles:list=Assigne
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Sale Trade Conditions to validate</string> </value>
+            <value> <string>Sale Trade Conditions to Validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>