From 3146a71b6b6e5e18980976c6377da2c18dde3345 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 26 Aug 2010 16:16:41 +0530
Subject: [PATCH] [IMP]: email_template: Improvement in label string and menu
 name

bzr revid: rpa@tinyerp.com-20100826104641-uw4hl7x3dx2nq5qk
---
 addons/email_template/email_template_account_view.xml  |  4 ++--
 addons/email_template/email_template_view.xml          |  4 ++--
 addons/email_template/i18n/en_US.po                    | 10 ++++++----
 .../wizard/email_template_send_wizard_view.xml         |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index b64f7ed779a..dbf22b61fad 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -99,7 +99,7 @@
         <menuitem name="Configuration" parent="base.marketing_menu"
             id="base.menu_marketing_config_root" sequence="20" groups="base.group_system"/>
 
-        <menuitem name="Emails" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
+        <menuitem name="Email Template" id="menu_email_template_configuration" parent="base.menu_marketing_config_root" />
 
         <menuitem name="Email Accounts" id="menu_email_template_account_all" parent="menu_email_template_configuration" action="action_email_template_account_tree_all"/>
 
@@ -110,7 +110,7 @@
         <menuitem name="Configuration" parent="base.menu_tools"
               id="base.menu_lunch_survey_root" sequence="20" />
 
-        <menuitem name="Emails" id="menu_email_template_config_tools"
+        <menuitem name="Email Template" id="menu_email_template_config_tools"
             parent="base.menu_lunch_survey_root" />
 
         <menuitem name="Email Accounts" id="menu_email_account_all_tools"
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 4393904779b..58b71c3e011 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -184,11 +184,11 @@
             <field name="search_view_id" ref="view_email_template_search"/>
         </record>
 
-        <menuitem name="E-MAIL Templates" id="menu_email_template_all"
+        <menuitem name="Email Templates" id="menu_email_template_all"
             parent="menu_email_template_configuration" action="action_email_template_tree_all" />
 
         <!-- Email Template menu in Tools -->
-        <menuitem name="E-MAIL Templates" id="menu_email_template_all_tools"
+        <menuitem name="Email Templates" id="menu_email_template_all_tools"
             parent="menu_email_template_config_tools" action="action_email_template_tree_all" />
     </data>
 </openerp>
diff --git a/addons/email_template/i18n/en_US.po b/addons/email_template/i18n/en_US.po
index 40cccf5a2cc..5c9c7ee55a9 100644
--- a/addons/email_template/i18n/en_US.po
+++ b/addons/email_template/i18n/en_US.po
@@ -174,8 +174,8 @@ msgstr "Approve Account"
 
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_all
-msgid "E-MAIL Templates"
-msgstr "E-MAIL Templates"
+msgid "Email Templates"
+msgstr "Email Templates"
 
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
@@ -767,8 +767,8 @@ msgstr "TLS"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
-msgid "Add here all attachments of the current document you want to include in the e-mail."
-msgstr "Add here all attachments of the current document you want to include in the e-mail."
+msgid "Add here all attachments of the current document you want to include in the Email."
+msgstr "Add here all attachments of the current document you want to include in the Email."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_send_wizard
@@ -781,6 +781,8 @@ msgstr "This is the wizard for sending mail"
 #: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #, python-format
 msgid "Email Template"
 msgstr "Email Template"
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index 80cce83dbfd..a5ad037aee6 100755
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -33,7 +33,7 @@
 								<field name="body_html" select="2" colspan="4" nolabel="1" />
 							</page>
 							<page string="Attachments">
-								<label string="Add here all attachments of the current document you want to include in the e-mail." colspan="4"/>
+								<label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
 								<field name="attachment_ids" colspan="4" nolabel="1"/>
 							</page>
 						</notebook>