Use translation_service instead of gettext.

Use UTF-8 instead of ISO-8859-1. Add a meta description. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1397 20353a03-c40f-0410-a6d1-a30d3c3de9de

Use translation_service instead of gettext.
Use UTF-8 instead of ISO-8859-1. Add a meta description. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1397 20353a03-c40f-0410-a6d1-a30d3c3de9de
0361d215 · Yoshinori Okuji · 02cba36d · 0361d215 · 0361d215 · 0361d215
Commit 0361d215 authored Aug 19, 2004 by Yoshinori Okuji
24 changed files
--- a/product/ERP5/skins/erp5_html_style/breadcrumb.pt
+++ b/product/ERP5/skins/erp5_html_style/breadcrumb.pt
@@ -18,17 +18,29 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 -->
 </span>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
+      xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <head>
-    <title tal:content="template/title">The title</title>
+    <meta name="description" content="Generated by breadcrumb" />
+    <title tal:content="template/title" i18n:translate="" i18n:domain="ui">The title</title>
  </head>
  <body>
    <div metal:define-macro="small_breadcrumb">
    <table width="100%">
      <tr>
        <td nowrap align="left">
-             <span tal:repeat="item here/breadcrumbs"><a href="url goes here" tal:attributes="href python:'%s/view' % item ['url']"><span tal:replace="item/title | item/id" /></a>&nbsp;/&nbsp;</span></td>
+          <span tal:repeat="item here/breadcrumbs">
-        <td  align="right"></td>
+            <a href="url goes here"
+               i18n:translate="" i18n:domain="content"
+               tal:attributes="href python:'%s/view' % item ['url']"
+               tal:content="item/title | item/id">
+              title
+            </a>&nbsp;/&nbsp;
+          </span>
+        </td>
+        <td align="right" />
      </tr>
    </table>
    </div>
@@ -36,9 +48,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <table width="100%">
        <tr>
          <td nowrap align="left">
-             <span tal:repeat="item here/breadcrumbs"><a href="url goes here" tal:attributes="href python:'%s/view' % item ['url']"><span tal:replace="item/title | item/id" /></a>&nbsp;/&nbsp;</span></td>
+            <span tal:repeat="item here/breadcrumbs">
-        <td  align="right" tal:condition="python: not here.portal_membership.isAnonymousUser()">&nbsp;<a href="undo_form">Created</a> by : <span tal:replace="python:here.getOwnerInfo()['id']" /> - <span tal:replace="here/bobobase_modification_time" /></td>
+              <a href="url goes here"
-        <td  align="right" tal:condition="python: here.portal_membership.isAnonymousUser()">&nbsp;</td>
+                i18n:translate="" i18n:domain="content"
+                tal:attributes="href python:'%s/view' % item ['url']"
+                tal:content="item/title | item/id">
+                title
+              </a>&nbsp;/&nbsp;
+            </span>
+          </td>
+          <td align="right"
+              tal:condition="python: not here.portal_membership.isAnonymousUser()">
+            &nbsp;
+            <a href="undo_form" i18n:translate="" i18n:domain="ui">Created by</a> :
+            <tal:block tal:replace="python:here.getOwnerInfo()['id']" />
+            -
+            <tal:block tal:replace="here/bobobase_modification_time" />
+          </td>
+          <td align="right"
+              tal:condition="python: here.portal_membership.isAnonymousUser()">
+            &nbsp;
+          </td>
        </tr>
      </table>
    </div>

--- a/product/ERP5/skins/erp5_html_style/cacheable_navigation_box.pt
+++ b/product/ERP5/skins/erp5_html_style/cacheable_navigation_box.pt
--- a/product/ERP5/skins/erp5_html_style/dialog_master.pt
+++ b/product/ERP5/skins/erp5_html_style/dialog_master.pt
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    xml:lang="en"
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    metal:define-macro="master">
  <script language="JavaScript" src="erp5.js"
@@ -35,8 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by dialog_master" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -88,9 +90,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <!-- Optional Portal Status Message -->
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
+     <table>
+       <tr>
+         <td class="error"
+             i18n:translate="" i18n:domain="ui"
             tal:content="request/portal_status_message">
-              </td></tr>
+         </td>
+       </tr>
     </table>
    </div>
    <!-- Main Zone -->
@@ -132,11 +138,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
          <input type="hidden" name="previous_form_id" value="previous_form_id"
                tal:attributes="value previous_form_id">
          <input type="Submit"  value="Cancel" name="base_cancel:method"
+                i18n:attributes="value" i18n:domain="ui"
                />&nbsp;
          <span tal:condition="python: form.update_action!=''">
          <input type="hidden" name="update_method" value="cancel_url"
                tal:attributes="value python: form.update_action"/>
          <input type="Submit"  value="Update"
+                i18n:attributes="value" i18n:domain="ui"
                name="base_update_dialog:method"/>
          </span>
          <input type="Submit"  value="Search"

--- a/product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt
@@ -27,11 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    xml:lang="en"
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_create_relation_dialog" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -44,12 +46,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                  dummy python: request.set('here',here)">
      <table width="100%">
        <tr>
-          <td>There is no such document in the database. You may create
+          <td i18n:translate="" i18n:domain="ui">
-              an new document of type <b tal:content="request/portal_type"></b>
+              There is no such document in the database. You may create
-              in relation with <b tal:content="here/getTitle"></b>
+              an new document of type <b tal:content="request/portal_type" i18n:name="portal_type">protal type</b>
-              according to relation <b tal:content="request/base_category"></b>.
+              in relation with <b tal:content="here/getTitle" i18n:name="title">title</b>
-              Use the form bellow to enter the <b tal:content="request/catalog_index"></b>
+              according to relation <b tal:content="request/base_category" i18n:name="base_category">base category</b>.
-              values of new documents.</td>
+              Use the form bellow to enter the <b tal:content="request/catalog_index" i18n:name="catalog_index">catalog index</b>
+              values of new documents.
+          </td>
        </tr>
        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
@@ -60,6 +64,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        </tr>
        <tr tal:condition="python: field_errors.has_key(field.id)">
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -80,5 +85,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_dialog.pt
@@ -27,11 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    xml:lang="en"
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    metal:use-macro="here/dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_dialog" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -48,7 +50,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <td>
        <table>
          <tr>
-            <td>Select:</td>
+            <td i18n:translate="" i18n:domain="ui">Select:</td>
            <td valign="middle" align="right" nowrap
                tal:define="dialog_category request/dialog_category;
                            actions python:filtered_actions[dialog_category]">
@@ -59,9 +61,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                <span tal:repeat="action actions">
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) < 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url">Saut</option>
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) >= 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url"
                   selected>Saut</option>
                </span>
@@ -69,6 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            <td valign="bottom" align="left" nowrap> &nbsp;
              <input type="image" src="/images/pro/images/exec16.png" title="Action"
                alt="Action" name="doDialog:method"
+                i18n:attributes="title" i18n:domain="ui"
                tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
            </td>
          </tr>
@@ -83,21 +88,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)">
@@ -108,6 +117,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -121,21 +131,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)">
@@ -146,6 +160,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -163,21 +178,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
           </td>
          </tr>
@@ -188,6 +207,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          </tr>
          <tr tal:condition="python: field_errors.has_key(field.id)">
            <td tal:content="python: field_errors[field.id].error_text"
+                i18n:translate="" i18n:domain="ui"
                class="error">
            </td>
          </tr>
@@ -211,5 +231,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_folder_delete.pt
+++ b/product/ERP5/skins/erp5_html_style/form_folder_delete.pt
@@ -27,11 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_folder_delete" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -52,6 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        </tr>
        <tr tal:condition="python: field_errors.has_key(field.id)">
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -67,5 +70,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_list.pt
+++ b/product/ERP5/skins/erp5_html_style/form_list.pt
@@ -27,11 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/list_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_list" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -57,5 +59,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
@@ -26,12 +26,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_list_dialog" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -47,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <td>
        <table>
          <tr tal:condition="request/dialog_category | nothing">
-            <td>Search Type:</td>
+            <td i18n:translate="" i18n:domain="ui">Search Type:</td>
            <td valign="middle" align="right" nowrap
                tal:define="dialog_category request/dialog_category;
                            actions python:filtered_actions[dialog_category]">
@@ -58,9 +60,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                <span tal:repeat="action actions">
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) < 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url">Saut</option>
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) >= 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url"
                   selected>Saut</option>
                </span>
@@ -68,6 +72,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            <td valign="bottom" align="left" nowrap> &nbsp;
              <input type="image" src="/images/pro/images/exec16.png" title="Action"
                alt="Action" name="doDialog:method"
+                i18n:attributes="title" i18n:domain="ui"
                tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
            </td>
          </tr>
@@ -82,21 +87,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -107,6 +116,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -120,21 +130,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -145,6 +159,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -161,21 +176,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
           </td>
          </tr>
@@ -186,6 +205,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          </tr>
          <tr tal:condition="python: field_errors.has_key(field.id)">
            <td tal:content="python: field_errors[field.id].error_text"
+                i18n:translate="" i18n:domain="ui"
                class="error">
            </td>
          </tr>
@@ -208,5 +228,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_list_relation.pt
+++ b/product/ERP5/skins/erp5_html_style/form_list_relation.pt
@@ -27,11 +27,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+      <meta name="description" content="Generated by form_list_relation" />
-      <title tal:content="template/title_or_id">The title</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title tal:content="template/title_or_id"     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+>The title</title>
      <link href="erp5.css" rel="stylesheet" type="text/css"/>
  </head>
@@ -51,6 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        </tr>
        <tr tal:condition="python: field_errors.has_key(field.id)">
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -67,5 +71,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_list_ui.pt
+++ b/product/ERP5/skins/erp5_html_style/form_list_ui.pt
@@ -27,19 +27,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by form_list_ui" />
-      <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
+    <title tal:content="template/title_or_id"
+           i18n:translate="" i18n:domain="ui">
+      The title
+    </title>
+    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
-  <body><div metal:fill-slot="main">
+  <body>
+    <div metal:fill-slot="main">
      <div class="Search">
+        <span tal:define="field_errors python: request.get('field_errors',{});
-<span tal:define="field_errors python: request.get('field_errors',{});
              form_id request/form_id;
              base_form python:getattr(here,form_id);
              groups base_form/get_groups;
@@ -53,38 +57,47 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
              all_columns python:base_form.get_fields_in_group(groups[0])[0].get_value('all_columns')">
          <table class="Border" width="100%">
-    <tr><td valign="top">
+            <tr>
+              <td valign="top">
                <table>
                  <span tal:repeat="item columns">
                    <tr tal:define="global row_index python:row_index+1;
                        dummy python:row_keys.append(item[0])">
                      <td>
-            Column <span tal:replace="row_index" />
+                        <tal:block i18n:translate="" i18n:domain="ui">Column</tal:block>
+                        <span tal:replace="row_index" />
                      </td>
                      <td>
                        <select name="field_columns">
                          <span tal:repeat="option python: [('None','None')] + all_columns">
                            <option tal:condition="python:option[0]==item[0]"
                                    tal:content="python: option[1]"
+                                    i18n:translate="" i18n:domain="ui"
                                    tal:attributes="value python:option[0]"
                                    value="None"
-                 selected></option>
+                                    selected />
                            <option tal:condition="python:option[0]!=item[0]"
                                    tal:content="python: option[1]"
+                                    i18n:translate="" i18n:domain="ui"
                                    tal:attributes="value python:option[0]"
-                 value="None"></option>
+                                    value="None" />
                          </span>
                        </select>
                        &nbsp;
                        <select name="stat_columns">
                          <span tal:repeat="stat stats">
                            <span tal:condition="python: len(selected_stats) >= row_index and stat == selected_stats[row_index - 1]">
-              <option tal:content="stat" tal:attributes="value stat" value="None" selected>
+                              <option tal:content="stat"
-              </option>
+                                      i18n:translate="" i18n:domain="ui"
+                                      tal:attributes="value stat"
+                                      value="None"
+                                      selected />
                            </span>
                            <span tal:condition="python: len(selected_stats) < row_index or stat != selected_stats[row_index - 1]">
-              <option tal:content="stat" tal:attributes="value stat" value="None">
+                              <option tal:content="stat"
-              </option>
+                                      i18n:translate="" i18n:domain="ui"
+                                      tal:attributes="value stat"
+                                      value="None" />
                            </span>
                          </span>
                        </select>
@@ -94,26 +107,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                  <span tal:repeat="item all_columns">
                    <tr tal:condition="python: item[0] not in row_keys">
                      <td tal:define="global row_index python:row_index+1">
-            Column <span tal:replace="row_index" />
+                        <tal:block i18n:translate="" i18n:domain="ui">Column</tal:block>
+                        <span tal:replace="row_index" />
                      </td>
                      <td>
                        <select name="field_columns">
-              <option selected value="None">None</option>
+                          <option selected
+                                  value="None"
+                                  i18n:translate="" i18n:domain="ui">
+                            None
+                          </option>
                          <option tal:repeat="option all_columns"
                                  tal:content="python:option[1]"
+                                  i18n:translate="" i18n:domain="ui"
                                  tal:attributes="value python:option[0]"
-                 value="None"></option>
+                                  value="None" />
                        </select>
                        &nbsp;
                        <select name="stat_columns">
                          <span tal:repeat="stat stats">
-		      <span tal:condition="python: len(selected_stats) >= row_index and stat == selected_stats[row_index - 1]" tal:on-error="string: row_index">
+                            <span tal:condition="python: len(selected_stats) >= row_index and stat == selected_stats[row_index - 1]"
-              <option tal:content="stat" tal:attributes="value stat" value="None" selected>
+                                  tal:on-error="string: row_index">
-              </option>
+                              <option tal:content="stat"
+                                      i18n:translate="" i18n:domain="ui"
+                                      tal:attributes="value stat"
+                                      value="None"
+                                      selected />
                            </span>
-	      <span tal:condition="python: len(selected_stats) < row_index or stat != selected_stats[row_index - 1]" tal:on-error="string: row_index">
+                            <span tal:condition="python: len(selected_stats) < row_index or stat != selected_stats[row_index - 1]"
-              <option tal:content="stat" tal:attributes="value stat" value="None">
+                                  tal:on-error="string: row_index">
-              </option>
+                              <option tal:content="stat"
+                                      i18n:translate="" i18n:domain="ui"
+                                      tal:attributes="value stat"
+                                      value="None" />
                            </span>
                          </span>
                        </select>
@@ -121,13 +147,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                    </tr>
                  </span>
                </table>
-    </td></tr>
+              </td>
+            </tr>
          </table>
-</span>
+        </span>
      </div>
    </div>
  </body>
-</html>
+</html>
--- a/product/ERP5/skins/erp5_html_style/form_sort.pt
+++ b/product/ERP5/skins/erp5_html_style/form_sort.pt
@@ -27,20 +27,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by form_sort" />
-      <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
+    <title tal:content="template/title_or_id"
+           i18n:translate="" i18n:domain="ui">
+      The title
+    </title>
+    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
  <body><div metal:fill-slot="main">
          <div class="Search">
-<span tal:define="gettext python:here.gettext;
+<span tal:define="groups python: form.get_groups(include_empty=1);
-                  groups python: form.get_groups(include_empty=1);
                  sort_on python:here.portal_selections.getSelectionSortOrder(selection_name, REQUEST=request);
                  dummy python: request.set('here',here);
                  global row_index python:0;
@@ -56,18 +60,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <tr tal:define="global row_index python:row_index+1;
                        dummy python:row_keys.append(item[0])">
          <td>
-            Sort <span tal:replace="row_index" />
+            <tal:block i18n:translate="" i18n:domain="ui">Sort</tal:block>
+            <span tal:replace="row_index" />
          </td>
          <td>
            <select name="field_sort_on">
              <span tal:repeat="option python: [('None','None')] + all_columns">
              <option tal:condition="python:option[0]==item[0]"
                 tal:content="python:option[1]"
+                 i18n:translate="" i18n:domain="ui"
                 tal:attributes="value python:option[0]"
                 value="None"
                 selected></option>
              <option tal:condition="python:option[0]!=item[0]"
                 tal:content="python:option[1]"
+                 i18n:translate="" i18n:domain="ui"
                 tal:attributes="value python:option[0]"
                 value="None"></option>
              </span>
@@ -81,13 +88,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <span tal:repeat="item all_columns">
        <tr tal:condition="python: item[0] not in row_keys">
          <td tal:define="global row_index python:row_index+1">
-            Sort <span tal:replace="row_index" />
+            <tal:block i18n:translate="" i18n:domain="ui">Sort</tal:block>
+            <span tal:replace="row_index" />
          </td>
          <td>
            <select name="field_sort_on">
              <option selected value="None">None</option>
              <option tal:repeat="option all_columns"
                 tal:content="python:option[1]"
+                 i18n:translate="" i18n:domain="ui"
                 tal:attributes="value python:option[0]"
                 value="None"></option>
            </select>
@@ -107,5 +116,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_view.pt
+++ b/product/ERP5/skins/erp5_html_style/form_view.pt
@@ -27,20 +27,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:use-macro="here/view_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by form_view" />
-      <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
+    <title tal:content="template/title_or_id"
+           i18n:translate="" i18n:domain="ui">
+      The title
+    </title>
+    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
  <body><div metal:fill-slot="main">
          <div class="Main">
-<span tal:define="gettext python:here.gettext;
+<span tal:define="groups python: form.get_groups(include_empty=1);
-                  groups python: form.get_groups(include_empty=1);
                  field_errors python: request.get('field_errors',{});
                  dummy python: request.set('here',here)">
  <table class="Border" width="100%" tal:condition="python:len(form.get_fields_in_group(groups[0])) > 0
@@ -49,24 +53,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <table>
        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
        <tr tal:condition="python:field.meta_type != 'HiddenStringField'">
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -76,7 +84,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <tr tal:condition="python: field_errors.has_key(field.id)">
          <td>
          </td>
-          <td tal:content="python:gettext(field_errors[field.id].error_text)"
+          <td tal:content="python:field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -90,21 +99,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
-          <td tal:content="structure python:gettext(field.title())"
+          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -114,7 +127,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <tr tal:condition="python: field_errors.has_key(field.id)">
          <td>
          </td>
-          <td tal:content="python: gettext(field_errors[field.id].error_text)"
+          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -129,24 +143,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    <table>
        <span tal:repeat="field python:form.get_fields_in_group(groups[2])">
         <tr tal:condition="python:field.meta_type != 'HiddenStringField'">
-           <td tal:content="structure python:gettext(field.title())"
+           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
           </td>
-           <td tal:content="structure python:gettext(field.title())"
+           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
           </td>
-           <td tal:content="structure python:gettext(field.title())"
+           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
           </td>
-           <td tal:content="structure python:gettext(field.title())"
+           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
           </td>
            <td tal:define="value python:request.get(field.id,None)">
@@ -154,7 +172,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            </td>
          </tr>
          <tr tal:condition="python: field_errors.has_key(field.id)">
-            <td tal:content="python: gettext(field_errors[field.id].error_text)"
+            <td tal:content="python: field_errors[field.id].error_text"
+                i18n:translate="" i18n:domain="ui"
                class="error">
            </td>
          </tr>
@@ -177,5 +196,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
+++ b/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
@@ -27,12 +27,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
-    metal:use-macro="here/view_dialog_master/macros/master">
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      metal:use-macro="here/list_dialog_master/macros/master">
  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by form_view_dialog" />
-      <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
+    <title tal:content="template/title_or_id"
+           i18n:translate="" i18n:domain="ui">
+      The title
+    </title>
+    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
  <body><div metal:fill-slot="main">
@@ -48,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <td>
        <table>
          <tr tal:condition="request/dialog_category | nothing">
-            <td>Search Type:</td>
+            <td i18n:translate="" i18n:domain="ui">Search Type:</td>
            <td valign="middle" align="right" nowrap
                tal:define="dialog_category request/dialog_category;
                            actions python:filtered_actions[dialog_category]">
@@ -59,15 +64,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                <span tal:repeat="action actions">
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) < 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url">Saut</option>
                 <option value="1" tal:content="action/name"
                   tal:condition="python: action['url'].find(form.id) >= 0"
+                   i18n:translate="" i18n:domain="ui"
                   tal:attributes="value action/url"
                   selected>Saut</option>
                </span>
              </select></td>
            <td valign="bottom" align="left" nowrap> &nbsp;
              <input type="image" src="/images/pro/images/exec16.png" title="Action"
+                i18n:attributes="title" i18n:domain="ui"
                alt="Action" name="doDialog:method" /> &nbsp;
            </td>
          </tr>
@@ -82,21 +90,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -107,6 +119,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -120,21 +133,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
          </td>
          <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
          </td>
          <td tal:define="value python:request.get(field.id,None)">
@@ -145,6 +162,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td>
          </td>
          <td tal:content="python: field_errors[field.id].error_text"
+              i18n:translate="" i18n:domain="ui"
              class="error">
          </td>
        </tr>
@@ -162,21 +180,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="error">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and not field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              >
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: field_errors.has_key(field.id)
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="reqerror">
           </td>
           <td tal:content="structure field/title"
              tal:condition="python: (not field_errors.has_key(field.id))
                      and field.is_required()"
+              i18n:translate="" i18n:domain="ui"
              class="required">
           </td>
          </tr>
@@ -187,6 +209,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          </tr>
          <tr tal:condition="python: field_errors.has_key(field.id)">
            <td tal:content="python: field_errors[field.id].error_text"
+                i18n:translate="" i18n:domain="ui"
                class="error">
            </td>
          </tr>
@@ -209,5 +232,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      </div>
  </body>
 </html>
--- a/product/ERP5/skins/erp5_html_style/global_definition.pt
+++ b/product/ERP5/skins/erp5_html_style/global_definition.pt
@@ -2,10 +2,16 @@
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      meta:define-macro="master">
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by global_definition" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id"
+           i18n:translate="" i18n:domain="ui">
+      The title
+    </title>
+    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
  <body>

--- a/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
+++ b/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <script language="JavaScript" src="erp5.js"
@@ -35,8 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by list_dialog_master" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -85,6 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
     <table><tr><td class="error"
+              i18n:translate="" i18n:domain="ui"
              tal:content="request/portal_status_message">
              </td></tr>
     </table>
@@ -133,9 +136,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
          <input type="hidden" name="previous_form_id" value="previous_form_id"
                tal:attributes="value previous_form_id">
          <input type="Submit"  value="Cancel" name="base_cancel:method"
+                 i18n:attributes="value" i18n:domain="ui"
                />&nbsp;
          <input type="Submit"  value="Search"
                 name="base_list_dialog:method"
+                 i18n:attributes="value" i18n:domain="ui"
                 tal:attributes="value form/title"/>
        </td>
        <td></td>

--- a/product/ERP5/skins/erp5_html_style/list_master.pt
+++ b/product/ERP5/skins/erp5_html_style/list_master.pt
@@ -28,14 +28,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <script language="JavaScript" src="erp5.js">
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by list_master" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -79,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
     <table><tr><td class="error"
+                    i18n:translate="" i18n:domain="ui"
                    tal:content="request/portal_status_message">
              </td></tr>
     </table>

--- a/product/ERP5/skins/erp5_html_style/list_menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/list_menu_box.pt
@@ -27,11 +27,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      xmlns:metal="http://xml.zope.org/namespaces/metal">
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by list_menu_box" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css" />
  </head>
@@ -46,19 +48,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
              tal:attributes="value selection_name">
          <input type="hidden" name="list_method_id" value="list_method_id"
              tal:attributes="value list_method_id" tal:condition="list_method_id">
-          <img src="/images/pro/images/sepacla.png" alt="img"
+          <img src="/images/pro/images/sepacla.png" alt="|"
               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
          <input type="image" src="/images/pro/images/editcopy.png" title="Copy"
               width="22" height="22"
               name="folder_copy:method" alt="Copy"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/editcopy.png"/>&nbsp;
          <input type="image" src="/images/pro/images/editcut.png" title="Cut"
               width="22" height="22"
               name="folder_cut:method" alt="Cut"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/editcut.png"/>&nbsp;
          <input type="image" src="/images/pro/images/editpaste.png" title="Paste"
               width="22" height="22"
               name="folder_paste:method" alt="Paste"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/editpaste.png"/>&nbsp;
          <img src="/images/pro/images/sepacla.png" alt="|"
               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
@@ -66,17 +71,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
          <input type="image" src="/images/pro/images/print.png" title="Print"
               width="22" height="22"
               name="folder_print:method" alt="Print"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/print.png"/>&nbsp;
          </span>
          <input type="image" src="/images/pro/images/filenew.png" title="New"
               width="22" height="22"
               name="folder_new:method" alt="New"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/filenew.png"/>&nbsp;
          <input type="image" src="/images/pro/images/edittrash.png"
               title="Delete" width="22" height="22"
               name="base_folder_delete:method" alt="Delete"
+               i18n:attributes="title" i18n:domain="ui"
               tal:attributes="src string:$portal_url/images/edittrash.png"/>&nbsp;
-          <img src="/images/pro/images/sepacla.png" alt="img"
+          <img src="/images/pro/images/sepacla.png" alt="|"
               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
          <span tal:condition="search_actions">
            <a href="" tal:attributes="
@@ -84,17 +92,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                + '?selection_name=%s&dialog_category=%s&form_id=%s'
                % (selection_name , 'object_search', form_id) ">
              <img src="/images/pro/images/find.png" width="22" height="22" border="0"
-                   title="Find" alt="img"
+                   title="Find" alt="Find"
+                   i18n:attributes="title" i18n:domain="ui"
                   tal:attributes="src string:$portal_url/images/find.png"/>
            </a>&nbsp;
          </span>
          <input type="image" src="/images/pro/images/toutsel.png" title="Show All"
                 width="22" height="22"
-               name="folder_show:method" alt="Cut"
+                 i18n:attributes="title" i18n:domain="ui"
+                 name="folder_show:method" alt="Show All"
                 tal:attributes="src string:$portal_url/images/toutsel.png"/>&nbsp;
          <input type="image" src="/images/pro/images/filter.png" title="Filter"
                 width="22" height="22"
-               name="folder_filter:method" alt="Cut"
+                 name="folder_filter:method" alt="Filter"
+                 i18n:attributes="title" i18n:domain="ui"
                 tal:attributes="src string:$portal_url/images/filter.png"/>&nbsp;
          <span tal:condition="sort_actions">
            <a href="" tal:attributes="
@@ -102,11 +113,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                + '?selection_name=%s&form_id=%s' %
                (selection_name, form_id)">
              <img src="/images/pro/images/trier.png" width="22" height="22" border="0"
-                   title="Sort" alt="img"
+                   title="Sort" alt="Sort"
+                   i18n:attributes="title" i18n:domain="ui"
                   tal:attributes="src string:$portal_url/images/trier.png"/>
            </a>&nbsp;
          </span>
-          <img src="/images/pro/images/sepacla.png" border="0" alt="img"
+          <img src="/images/pro/images/sepacla.png" border="0" alt="|"
               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
          <span tal:condition="exchange_actions">
            <a href="" tal:attributes="
@@ -114,7 +126,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                + '?selection_name=%s&dialog_category=%s&form_id=%s'
                % (selection_name , 'object_exchange', form_id) ">
              <img src="/images/pro/images/imp-exp.png" width="22" height="22" border="0"
-                   title="Import / Export" alt="img"
+                   title="Import / Export" alt="Import / Export"
+                   i18n:attributes="title" i18n:domain="ui"
                   tal:attributes="src string:$portal_url/images/imp-exp.png"/> &nbsp;
            </a>
          </span>
@@ -124,12 +137,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                + '?selection_name=%s&dialog_category=%s&form_id=%s'
                % (selection_name , 'object_report', form_id) ">
               <img src="/images/pro/images/etat3.png" width="22" height="22" border="0"
-                    title="Report" alt="img"
+                    title="Report" alt="Report"
+                    i18n:attributes="title" i18n:domain="ui"
                    tal:attributes="src string:$portal_url/images/etat3.png"/> &nbsp;
             </a>
          </span>
          <span tal:condition="exchange_actions | report_actions">
-            <img src="/images/pro/images/sepacla.png" border="0" alt="img"
+            <img src="/images/pro/images/sepacla.png" border="0" alt="|"
                 tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
          </span>
          <span tal:condition="ui_actions">
@@ -138,7 +152,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                + '?selection_name=%s&form_id=%s' %
                (selection_name, form_id)">
              <img src="/images/pro/images/configure.png" width="22" height="22" border="0"
-                   title="Parameter" alt="img"
+                   title="Configure" alt="Configure"
+                   i18n:attributes="title" i18n:domain="ui"
                   tal:attributes="src string:$portal_url/images/configure.png"/>
            </a>
          </span>

--- a/product/ERP5/skins/erp5_html_style/main_template.pt
+++ b/product/ERP5/skins/erp5_html_style/main_template.pt
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <script language="JavaScript" src="erp5.js"
@@ -35,9 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html;
+    <meta name="description" content="Generated by main_template" />
-     charset=iso-8859-1" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id">The title</title>
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -92,6 +93,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
     <table><tr><td class="error"
+                    i18n:translate="" i18n:domain="ui"
                    tal:content="request/portal_status_message">
              </td></tr>
     </table>

--- a/product/ERP5/skins/erp5_html_style/menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/menu_box.pt
@@ -28,11 +28,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+    <meta name="description" content="Generated by menu_box" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
  </head>
  <body>
@@ -41,36 +43,39 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
        <tr>
          <td valign="middle" align="left" nowrap>&nbsp;
             <select name="jump_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/doJump')">
-              <option selected value="1" disabled>Jump...</option>
+              <option selected value="1" disabled i18n:translate="" i18n:domain="ui">Jump...</option>
              <span tal:repeat="action jump_actions">
               <option value="1" tal:content="action/name"
+                       i18n:translate="" i18n:domain="ui"
                       tal:attributes="value action/url">Saut</option>
              </span>
             </select></td>
          <td valign="bottom" align="center" nowrap>
            <input type="image" src="/images/pro/images/jump.png" title="Jump"
              alt="Jump" name="doJump:method"
+              i18n:attributes="title" i18n:domain="ui"
              tal:attributes="src string:$portal_url/images/jump.png"/> &nbsp;
-            <img src="/images/pro/images/sepacla.png" alt="img"
+            <img src="/images/pro/images/sepacla.png" alt="|"
                 tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;&nbsp;
          </td>
          <td valign="middle" align="right" nowrap>
            <select name="action_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/doAction')">
-              <option selected value="" disabled>Action...</option>
+              <option selected value="" disabled i18n:translate="" i18n:domain="ui">Action...</option>
              <span tal:repeat="content here/allowedContentTypes | nothing"
                    tal:on-error="nothing">
               <option value="" tal:attributes="value python: 'add ' + content.id"
-                 tal:content="python:'Add %s' % (content.title or content.id)"
+                 i18n:translate="" i18n:domain="ui">Add <tal:block tal:content="content/title | content/id" i18n:name="portal_type">portal type</tal:block></option>
-                 i18n:translate=""></option>
              </span>
-              <option disabled>-- workflows --</option>
+              <option disabled i18n:translate="" i18n:domain="ui">-- workflows --</option>
              <span tal:repeat="action workflow_actions">
               <option value="1" tal:content="action/name"
+                 i18n:translate="" i18n:domain="ui"
                 tal:attributes="value python: 'workflow ' + action['url']">Saut</option>
              </span>
-              <option disabled>-- object --</option>
+              <option disabled i18n:translate="" i18n:domain="ui">-- object --</option>
              <span tal:repeat="action object_actions">
               <option value="1" tal:content="action/name"
+                 i18n:translate="" i18n:domain="ui"
                 tal:attributes="value python: 'object ' + action['url']">Saut</option>
              </span>
              <!--option disabled>-- folder --</option>
@@ -82,13 +87,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
          <td valign="bottom" align="left" nowrap> &nbsp;
            <input type="image" src="/images/pro/images/exec16.png" title="Action"
              alt="Action" name="doAction:method"
+              i18n:attributes="title" i18n:domain="ui"
              tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
          </td>
          <td width="100%"><span metal:define-slot="buttons"/></td>
          <td aligh="right" valign="center">
            <img alt="Activity Pending" src="/images/pro/images/activity_busy.png"
                 tal:condition="here/hasActivity | nothing"
-                 border="0" title="Flush Activities"
+                 border="0" title="Activity Pending"
+                 i18n:translate="title" i18n:domain="ui"
                 tal:attributes="src string:$portal_url/images/activity_busy.png"/>
          </td>
        </tr>

--- a/product/ERP5/skins/erp5_html_style/navigation_box.pt
+++ b/product/ERP5/skins/erp5_html_style/navigation_box.pt
@@ -26,16 +26,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
    xml:lang="en"
    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
    meta:define-macro="master">
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by navigation_box" />
-    <title tal:content="template/title_or_id">The title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
  </head>
  <body>
-    <table width="100%" metal:define-macro="navigation_box"
+    <table width="100%" metal:define-macro="navigation_box">
-           tal:define="gettext python:here.gettext">
      <tr>
        <td valign="middle" align="center" nowrap>
          <!-- Hidden button as explained in http://ppewww.ph.gla.ac.uk/~flavell/www/formquestion.html -->
@@ -47,20 +48,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                                 src string:$portal_url/images/spacer.png">
          <select name="favorite_select" size="1"
              tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/doFavorite')">
-            <option selected value="" i18:translate="" disabled>My favourites</option>
+            <option selected value="" i18n:translate="" i18n:domain="ui" disabled>My favourites</option>
            <span tal:condition="ordered_global_actions">
              <span tal:repeat="action ordered_global_actions">
-                <option disabled tal:content="python: '-- %s --' % action['title']" tal:condition="action/disabled"/>
+                <option disabled
+                        tal:condition="action/disabled"
+                        i18n:translate="" i18n:domain="ui">
+                  -- <tal:block tal:replace="action/title" /> --
+                </option>
                <option value="1"
+                    i18n:translate="" i18n:domain="ui"
                    tal:content="action/name"
                    tal:attributes="value action/url"
-                   tal:condition="python: not action['disabled']">Saut</option>
+                    tal:condition="not:action/disabled">Saut</option>
              </span>
            </span>
            <span tal:condition="user_actions">
-              <option disabled>-- user --</option>
+              <option disabled
+                      i18n:translate="" i18n:domain="ui">
+                -- User --
+              </option>
              <span tal:repeat="action user_actions">
-                 <option value="1" tal:content="python:gettext(action['name'])"
+                 <option value="1"
+                   i18n:translate="" i18n:domain="ui"
+                   tal:content="action/name"
                   tal:attributes="value action/url">Saut</option>
              </span>
            </span>
@@ -68,24 +79,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        </td>
        <td valign="middle" align="left" nowrap>
          <input type="image" src="/images/pro/images/favourite.png" title="Select Favorite"
+              i18n:attributes="title" i18n:domain="ui"
              alt="Select Favorite" name="doFavorite:method"
              tal:attributes="src string:$portal_url/images/favourite.png"/>&nbsp;
-          <img src="/images/pro/images/sepafon.png"   alt="img" tal:attributes="src string:$portal_url/images/sepafon.png"/>&nbsp;&nbsp;
+          <img src="/images/pro/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/>&nbsp;&nbsp;
        </td>
        <td align="center" valign="middle" nowrap>
            <select name="module_select" size="1"
                    tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/doModule')"
-                    tal:define="module_list here/getModuleList">
+                    tal:define="module_list here/ERP5Site_getModuleItemList">
-                <option selected value="" i18n:translate="" disabled>ERP5 Modules</option>
+                <option selected value="" i18n:translate="" i18n:domain="ui" disabled>ERP5 Modules</option>
                <span tal:repeat="module module_list">
                  <option value="something"
-                          tal:attributes="value module/url"
+                          i18n:translate="" i18n:domain="ui"
-                          tal:content="module/title | module/id" />
+                          tal:attributes="value python: module[0]"
+                          tal:content="python: module[1]" />
                </span>
            </select>
        </td>
        <td align="left" valign="middle" nowrap>
          <input type="image" src="/images/pro/images/appearance.png" title="Select Module"
+              i18n:attributes="title" i18n:domain="ui"
              alt="Select Module" name="doModule:method" tal:attributes="src string:$portal_url/images/appearance.png"/>&nbsp;
          <!--img src="/images/pro/images/sepafon.png"  alt="img" />&nbsp;
          <a href="undo_form">
@@ -96,24 +110,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <td valign="middle" align="center" nowrap width="100%">
          <div align="center">
            <!--img src="/images/pro/images/mail.png"  alt="Email" title="Email"
-                 tal:attributes="alt python:gettext('Email');
+                 i18n:attributes="title"/>
-                                 title python:gettext('Email')"/>
            <a href="http://www.coramy.fr">
-            <img src="/images/pro/images/intranet.png" alt="img"
+            <img src="/images/pro/images/intranet.png" alt="Intranet" title="Intranet"
-               tal:attributes="alt python:gettext('Intranet');
+               i18n:attributes="title"/></a>
-                                 title python:gettext('Intranet')"/></a>
            <a href="http://192.168.253.14:9673/coramy/help/index"
               tal:attributes="href here/portal_properties/online_help_url">
-            <img src="/images/pro/images/help.png"  alt="img"
+            <img src="/images/pro/images/help.png"  alt="Online Help" title="Online Help"
-                 tal:attributes="alt python:gettext('Online Help');
+                 i18n:attributes="title"/></a-->
-                                 title python:gettext('Online Help')"/></a-->
          </div>
        </td>
        <td  align="right" valign="middle">
            <input type="text" name="SearchableText">
        </td>
        <td  align="right" valign="middle">
-          <input type="image" src="/images/pro/images/info.png" title="Search" alt="Search"  name="search:method"
+          <input type="image" src="/images/pro/images/info.png"
+                 title="Search" alt="Search"  name="search:method"
+                 i18n:attributes="title" i18n:domain="ui"
                 tal:attributes="src string:$portal_url/images/info.png" />
        </td>
      </tr>

--- a/product/ERP5/skins/erp5_html_style/view_dialog_master.pt
+++ b/product/ERP5/skins/erp5_html_style/view_dialog_master.pt
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <script language="JavaScript" src="erp5.js"
@@ -35,9 +36,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <meta name="description" content="Generated by view_dialog_master" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <!--title tal:content="template/title_or_id">The title</title-->
-    <title tal:content="request/button_title|template/title_or_id">The title</title>
+    <title tal:content="request/button_title|template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -90,6 +92,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
     <table><tr><td class="error"
+              i18n:translate="" i18n:domain="ui"
              tal:content="request/portal_status_message">
              </td></tr>
     </table>
@@ -144,9 +147,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
                tal:attributes="value python: form.update_action"/>
          <input type="Submit"  value="Cancel"
                name="base_view_update_dialog:method"
+                i18n:attributes="value" i18n:domain="ui"
                tal:attributes="value request/button_title|form/title"/>
          </span>
          <input type="Submit"  value="Search"
+                i18n:attributes="value" i18n:domain="ui"
                name="base_view_dialog:method"
                tal:attributes="value request/button_title|form/title"/>
        </td>

--- a/product/ERP5/skins/erp5_html_style/view_master.pt
+++ b/product/ERP5/skins/erp5_html_style/view_master.pt
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      metal:define-macro="master">
  <script language="JavaScript" src="erp5.js"
@@ -35,9 +36,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  </script>
  <head>
-    <meta http-equiv="Content-Type" content="text/html;
+    <meta name="description" content="Generated by view_master" />
-     charset=iso-8859-1" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id">The title</title>
+    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
    <link href="erp5.css" rel="stylesheet" type="text/css"
         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
  </head>
@@ -89,6 +90,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    <div class="Main"
       tal:condition="request/portal_status_message | nothing">
     <table><tr><td class="error"
+                    i18n:translate="" i18n:domain="ui"
                    tal:content="request/portal_status_message">
              </td></tr>
     </table>

--- a/product/ERP5/skins/erp5_html_style/view_menu_box.pt
+++ b/product/ERP5/skins/erp5_html_style/view_menu_box.pt
@@ -26,19 +26,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      xmlns:metal="http://xml.zope.org/namespaces/metal">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"
+    <meta name="description" content="Generated by view_menu_box" />
- />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title tal:content="template/title_or_id">The title</title>
+  <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
  <link href="erp5.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
  <div metal:define-macro="menu_box"
-    tal:define="gettext python:here.gettext;
+    tal:define="form_id form/id | nothing;
-                form_id form/id | nothing;
                selection_name python:request.get('selection_name','default');
                selection_index request/selection_index | nothing;
                selection_url python:here.portal_selections.getSelectionListUrlFor(selection_name,REQUEST=request)
@@ -51,15 +51,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    tal:attributes="value selection_url">
   <div metal:use-macro="here/menu_box/macros/menu_box">
    <div metal:fill-slot="buttons">
-     <img src="/images/pro/images/sepacla.png" alt="img"
+     <img src="/images/pro/images/sepacla.png" alt="|"
     tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
     <span tal:condition="selection_url">
       <a href="list" tal:attributes="href selection_url">
        <img src="/images/pro/images/text_block.png" width="22" height="22"
          title="List Mode" alt="List Mode" border="0"
+          i18n:attributes="title" i18n:domain="ui"
          tal:attributes="src string:$portal_url/images/text_block.png"/>&nbsp;
       </a>
-       <img src="/images/pro/images/sepacla.png"  alt="img"
+       <img src="/images/pro/images/sepacla.png"  alt="|"
            tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
     </span>
     <span tal:condition="search_actions">
@@ -68,9 +69,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            + '?selection_name=%s&dialog_category=%s&form_id=%s'
            % (selection_name , 'object_search', form_id) ">
          <img src="/images/pro/images/find.png" width="22" height="22" border="0"
-               title="Find" alt="Find" tal:attributes="title python:gettext('Find');
+               title="Find" alt="Find"
-                                      alt python:gettext('Find');
+               i18n:attributes="title" i18n:domain="ui"
-                                      src string:$portal_url/images/find.png"/>
+               tal:attributes="src string:$portal_url/images/find.png"/>
        </a>&nbsp;
     </span>
     <span tal:condition="print_actions">
@@ -78,54 +79,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
         tal:attributes="href python:print_actions[0]['url']
            + '?selection_name=%s&dialog_category=%s&form_id=%s'
            % (selection_name , 'object_print', form_id) ">
-         <img src="/images/pro/images/print.png" title="Print" width="22" height="22"
+         <img src="/images/pro/images/print.png"
-          alt="Print" border="0" tal:attributes="title python:gettext('Print');
+              title="Print" width="22" height="22"
-                                           alt python:gettext('Print');
+              alt="Print" border="0"
-                                           src string:$portal_url/images/print.png"/>
+              i18n:attributes="title" i18n:domain="ui"
+              tal:attributes="src string:$portal_url/images/print.png"/>
     </a>&nbsp;
     </span>
     <input type="image" src="/images/pro/images/filenew.png" title="New"
            width="22" height="22" name="document_new:method" alt="New"
-            tal:attributes="title python:gettext('New');
+            i18n:attributes="title" i18n:domain="ui"
-                            alt python:gettext('New');
+            tal:attributes="src string:$portal_url/images/filenew.png"/>&nbsp;
-                            src string:$portal_url/images/filenew.png"/>&nbsp;
     <span tal:condition="selection_index">
-       <img src="/images/pro/images/sepacla.png" border="0"
+       <img src="/images/pro/images/sepacla.png" border="0" alt="|"
            tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
       <a href="First" tal:attributes="href
          string:portal_selections/viewFirst?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
          ><img width="22" height="22"
          src="/images/pro/images/2leftarrowb.png" border="0"
          title="First"  alt="First"
-          tal:attributes="alt python:gettext('First');
+          i18n:attributes="title" i18n:domain="ui"
-                          title python:gettext('First');
+          tal:attributes="src string:$portal_url/images/2leftarrowb.png" /></a>
-                          src string:$portal_url/images/2leftarrowb.png" /></a>
       <a href="Previous" tal:attributes="href
          string:portal_selections/viewPrevious?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
          ><img width="22" height="22"
          src="/images/pro/images/1leftarrowb.png" border="0"
          title="Previous"  alt="Previous"
-          tal:attributes="alt python:gettext('Previous');
+          i18n:attributes="title" i18n:domain="ui"
-                          title python:gettext('Previous');
+          tal:attributes="src string:$portal_url/images/1leftarrowb.png" /></a>
-                          src string:$portal_url/images/1leftarrowb.png" /></a>
       <a href="Next" tal:attributes="href
          string:portal_selections/viewNext?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
          ><img width="22" height="22"
          src="/images/pro/images/1rightarrowb.png" border="0"
          title="Next"  alt="Next"
-          tal:attributes="alt python:gettext('Next');
+          i18n:attributes="title" i18n:domain="ui"
-                     title python:gettext('Next');
+          tal:attributes="src string:$portal_url/images/1rightarrowb.png"/></a>
-                     src string:$portal_url/images/1rightarrowb.png"/></a>
       <a href="Last" tal:attributes="href
          string:portal_selections/viewLast?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
          ><img width="22" height="22"
          src="/images/pro/images/2rightarrowb.png" border="0"
          title="Last"  alt="Last"
-          tal:attributes="alt python:gettext('Last');
+          i18n:attributes="title" i18n:domain="ui"
-                          title python:gettext('Last');
+          tal:attributes="src string:$portal_url/images/2rightarrowb.png"/></a>&nbsp;
-                          src string:$portal_url/images/2rightarrowb.png"/></a>&nbsp;
     </span>
-     <img src="/images/pro/images/sepacla.png" border="0" alt="img"
+     <img src="/images/pro/images/sepacla.png" border="0" alt="|"
          tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
     <span tal:condition="exchange_actions">
        <a href="" tal:attributes="
@@ -133,10 +130,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            + '?selection_name=%s&dialog_category=%s&form_id=%s'
            % (selection_name , 'object_exchange', form_id) ">
          <img src="/images/pro/images/imp-exp.png" width="22" height="22" border="0"
-               title="Import / Export" alt="Import"
+               title="Import / Export" alt="Import / Export"
-               tal:attributes="alt python:gettext('Import/Export');
+               i18n:attributes="title" i18n:domain="ui"
-                               title python:gettext('Import/Export');
+               tal:attributes="src string:$portal_url/images/imp-exp.png"/> &nbsp;
-                               src string:$portal_url/images/imp-exp.png"/> &nbsp;
        </a>
     </span>
     <span tal:condition="report_actions">
@@ -146,9 +142,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            % (selection_name , 'object_report', form_id) ">
           <img src="/images/pro/images/etat3.png" width="22" height="22" border="0"
                title="Report" alt="Report"
-                tal:attributes="alt python:gettext('Report');
+                i18n:attributes="title" i18n:domain="ui"
-                                title python:gettext('Report');
+                tal:attributes="src string:$portal_url/images/etat3.png"/> &nbsp;
-                                src string:$portal_url/images/etat3.png"/> &nbsp;
         </a>
     </span>
    </div>

--- a/product/ERP5/skins/erp5_html_style/view_selection_box.pt
+++ b/product/ERP5/skins/erp5_html_style/view_selection_box.pt
@@ -27,18 +27,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
      xml:lang="en"
      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      xmlns:metal="http://xml.zope.org/namespaces/metal">
 <head>
-  <title tal:content="template/title_or_id">The title</title>
+  <meta name="description" content="Generated by view_selection_box" />
-  <link href="erp5.css" rel="stylesheet" type="text/css"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
+  <link href="erp5.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
  <div metal:define-macro="view_selection_box">
   <table border="0" cellpadding="0" cellspacing="0" width="100%"
     class="Outmain"
-     tal:define="gettext python:here.gettext;
+     tal:define="isAnon python:here.portal_membership.isAnonymousUser();
-        isAnon python:here.portal_membership.isAnonymousUser();
        AuthClass python:isAnon and 'GuestActions' or 'MemberActions';
        uname python: isAnon and 'Guest' or
            here.portal_membership.getAuthenticatedMember().getUserName();
@@ -59,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        <tr>
         <span tal:repeat="action view_actions">
          <td valign="bottom" width="17">
-           <img src="/images/pro/images/Left.png" border="0" alt="img"
+           <img src="/images/pro/images/Left.png" border="0" alt="left"
           tal:attributes="src string:$portal_url/images/Left.png"/>
          </td>
          <td nowrap class="BorderTop" valign="bottom">
@@ -67,7 +69,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
                alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
          </td>
          <td valign="bottom" width="17">
-           <img src="/images/pro/images/Right.png" border="0"  alt="img"
+           <img src="/images/pro/images/Right.png" border="0"  alt="right"
                tal:attributes="src string:$portal_url/images/Right.png"/>
          </td>
         </span>
@@ -101,7 +103,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td nowrap class="On" align="center" valign="bottom"
             tal:condition="python: current_url == action['url']"
             tal:define="url action/url">
-           <a tal:content="python:gettext(action['name'])" href="toto"
+           <a tal:content="action/name" href="toto"
+             i18n:translate="" i18n:domain="ui"
             tal:attributes="href string:$url?selection_index=$selection_index&selection_name=$selection_name">
            Info.G&eacute;n&eacute;rales
           </a>
@@ -109,7 +112,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
          <td  nowrap class="Off" valign="bottom" align="center"
             tal:condition="python: current_url != action['url']"
             tal:define="url action/url">
-           <a tal:content="python:gettext(action['name'])" href="toto"
+           <a tal:content="action/name" href="toto"
+             i18n:translate="" i18n:domain="ui"
             tal:attributes="href string:$url?selection_index=$selection_index&selection_name=$selection_name">
            Info.G&eacute;n&eacute;rales
           </a>
@@ -152,9 +156,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
      <input type="image" alt="Save" src="/images/pro/images/save2.png"
        tal:condition="form/action | nothing"
        border="0" title="Save" name="action:method"
+        i18n:attributes="title" i18n:domain="ui"
        tal:attributes="name python: form.action + ':method';
-                        alt python:gettext('Save');
-                        title python:gettext('Save');
                        src string:$portal_url/images/save2.png"/>
     </td>
    </tr>