${company.partner_id and company.partner_id.country_id.name or ''|entity}
/
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index d7095324a88..946da6dd6b6 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -194,7 +194,7 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
msgstr ""
#. module: mail
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f86ae29c80f..6dbe72337fc 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -202,10 +202,10 @@ class mail_message(osv.osv):
_columns = {
'type': fields.selection([
- ('email', 'e-mail'),
+ ('email', 'email'),
('comment', 'Comment'),
('notification', 'System notification'),
- ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
+ ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"),
'partner_id': fields.many2one('res.partner', 'Related partner'),
'user_id': fields.many2one('res.users', 'Related User', readonly=1),
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
@@ -228,7 +228,7 @@ class mail_message(osv.osv):
}
#------------------------------------------------------
- # E-Mail api
+ # Email api
#------------------------------------------------------
def init(self, cr):
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 2223d9e162a..f62e29fb44d 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -36,7 +36,7 @@ class res_users(osv.osv):
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('none', 'Never')
- ], 'Receive Feeds by E-mail', required=True,
+ ], 'Receive Feeds by Email', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."),
}
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index dd07cbce9b2..cb2ed1eec19 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -34,7 +34,7 @@ from ..mail_message import to_email
EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
class mail_compose_message(osv.osv_memory):
- """Generic E-mail composition wizard. This wizard is meant to be inherited
+ """Generic Email composition wizard. This wizard is meant to be inherited
at model and view level to provide specific wizard features.
The behavior of the wizard can be modified through the use of context
@@ -58,7 +58,7 @@ class mail_compose_message(osv.osv_memory):
"""
_name = 'mail.compose.message'
_inherit = 'mail.message.common'
- _description = 'E-mail composition wizard'
+ _description = 'Email composition wizard'
def default_get(self, cr, uid, fields, context=None):
"""Overridden to provide specific defaults depending on the context
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 973a716351f..be6053bc189 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -491,7 +491,7 @@ msgstr ""
#. module: marketing_campaign
#: help:marketing.campaign.activity,email_template_id:0
-msgid "The e-mail to send when this activity is activated"
+msgid "The email to send when this activity is activated"
msgstr ""
#. module: marketing_campaign
@@ -837,7 +837,7 @@ msgstr ""
#. module: marketing_campaign
#: selection:marketing.campaign.activity,type:0
-msgid "E-mail"
+msgid "Email"
msgstr ""
#. module: marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 1e87925bdf3..a6294182301 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -392,7 +392,7 @@ class marketing_campaign_activity(osv.osv):
_description = "Campaign Activity"
_action_types = [
- ('email', 'E-mail'),
+ ('email', 'Email'),
('report', 'Report'),
('action', 'Custom Action'),
# TODO implement the subcampaigns.
@@ -423,7 +423,7 @@ class marketing_campaign_activity(osv.osv):
- Report: print an existing Report defined on the resource item and save it into a specific directory
- Custom Action: execute a predefined action, e.g. to modify the fields of the resource record
"""),
- 'email_template_id': fields.many2one('email.template', "Email Template", help='The e-mail to send when this activity is activated'),
+ 'email_template_id': fields.many2one('email.template', "Email Template", help='The email to send when this activity is activated'),
'report_id': fields.many2one('ir.actions.report.xml', "Report", help='The report to generate when this activity is activated', ),
'report_directory_id': fields.many2one('document.directory','Directory',
help="This folder is used to store the generated reports"),
diff --git a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
index b14f7064901..1faa22d1791 100644
--- a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
+++ b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
@@ -52,7 +52,7 @@ msgstr ""
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid ""
-"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"This plug-in allows you to link your email to OpenERP's documents. You can "
"attach it to any existing one in OpenERP or create a new one."
msgstr ""
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index ec9a8c72610..586c7ffb1c7 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -12,7 +12,7 @@
Install Thunderbird Plug-In
-
+
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index ac37f201380..a784c7c43ef 100644
--- a/addons/portal/i18n/portal.pot
+++ b/addons/portal/i18n/portal.pot
@@ -60,7 +60,7 @@ msgstr ""
#. module: portal
#: field:res.portal.wizard.user,user_email:0
-msgid "E-mail"
+msgid "Email"
msgstr ""
#. module: portal
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 1ec4cbb0e4b..1c31a6fa00a 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -197,7 +197,7 @@ class wizard_user(osv.osv_memory):
string='User Name',
help="The user's real name"),
'user_email': fields.char(size=64, required=True,
- string='E-mail',
+ string='Email',
help="Will be used as user login. "
"Also necessary to send the account information to new users"),
'lang': fields.selection(_lang_get, required=True,
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 19c18efd5d1..46cf1a9279a 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -663,7 +663,7 @@ msgstr ""
#. module: project
#: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
msgstr ""
#. module: project
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index e8d6e60bd1d..83a2b97cac0 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -72,7 +72,7 @@ msgstr ""
#. module: report_webkit_sample
#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "E-mail"
+msgid "Email"
msgstr ""
#. module: report_webkit_sample
diff --git a/addons/report_webkit_sample/report/report_webkit_html.mako b/addons/report_webkit_sample/report/report_webkit_html.mako
index 909e254fa40..164a697f386 100644
--- a/addons/report_webkit_sample/report/report_webkit_html.mako
+++ b/addons/report_webkit_sample/report/report_webkit_html.mako
@@ -22,7 +22,7 @@
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index c9c9e09cd2f..8d4c4c57024 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -52,7 +52,7 @@ msgstr ""
#. module: share
#: view:share.wizard:0
-msgid "Share with these People (one e-mail per line)"
+msgid "Share with these People (one email per line)"
msgstr ""
#. module: share
@@ -372,7 +372,7 @@ msgstr ""
#. module: share
#: view:share.wizard:0
msgid ""
-"An e-mail notification with instructions has been sent to the following "
+"An email notification with instructions has been sent to the following "
"people:"
msgstr ""
@@ -404,7 +404,7 @@ msgstr ""
#. module: share
#: help:share.wizard,message:0
msgid ""
-"An optional personal message, to be included in the e-mail notification."
+"An optional personal message, to be included in the email notification."
msgstr ""
#. module: share
@@ -472,7 +472,7 @@ msgstr ""
#. module: share
#: code:addons/share/wizard/share_wizard.py:197
#, python-format
-msgid "No e-mail address configured"
+msgid "No email address configured"
msgstr ""
#. module: share
@@ -512,7 +512,7 @@ msgstr ""
#: code:addons/share/wizard/share_wizard.py:198
#, python-format
msgid ""
-"You must configure your e-mail address in the user preferences before using "
+"You must configure your email address in the user preferences before using "
"the Share button."
msgstr ""
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 07004f333a8..30740d81e51 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -176,7 +176,7 @@ class share_wizard(osv.osv_memory):
help='Main access page for users that are granted shared access'),
'name': fields.char('Share Title', size=64, required=True, help="Title for the share (displayed to users as menu and shortcut name)"),
'record_name': fields.char('Record name', size=128, help="Name of the shared record, if sharing a precise record"),
- 'message': fields.text("Personal Message", help="An optional personal message, to be included in the e-mail notification."),
+ 'message': fields.text("Personal Message", help="An optional personal message, to be included in the email notification."),
'embed_code': fields.function(_embed_code, type='text'),
'embed_option_title': fields.boolean("Display title"),
@@ -200,8 +200,8 @@ class share_wizard(osv.osv_memory):
def go_step_1(self, cr, uid, ids, context=None):
wizard_data = self.browse(cr,uid,ids,context)[0]
if wizard_data.user_type == 'emails' and not self.has_email(cr, uid, context=context):
- raise osv.except_osv(_('No e-mail address configured'),
- _('You must configure your e-mail address in the user preferences before using the Share button.'))
+ raise osv.except_osv(_('No email address configured'),
+ _('You must configure your email address in the user preferences before using the Share button.'))
model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
action = self.pool.get(model).read(cr, uid, res_id, context=context)
action['res_id'] = ids[0]
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 1c9bb011432..311422f1c07 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -37,10 +37,10 @@
-
+
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index 6242a328e26..28ea57f11f6 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -996,7 +996,7 @@ msgstr ""
#. module: survey
#: field:survey,send_response:0
-msgid "E-mail Notification on Answer"
+msgid "Email Notification on Answer"
msgstr ""
#. module: survey
@@ -1211,7 +1211,7 @@ msgstr ""
#. module: survey
#: field:survey.request,email:0
-msgid "E-mail"
+msgid "Email"
msgstr ""
#. module: survey
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index cc65a2ec2e5..1b45bfd2dfa 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -66,7 +66,7 @@ class survey(osv.osv):
'note': fields.text('Description', size=128),
'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
- 'send_response': fields.boolean('E-mail Notification on Answer'),
+ 'send_response': fields.boolean('Email Notification on Answer'),
'type': fields.many2one('survey.type', 'Type'),
'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
}
@@ -699,7 +699,7 @@ class survey_request(osv.osv):
_columns = {
'date_deadline': fields.date("Deadline date"),
'user_id': fields.many2one("res.users", "User"),
- 'email': fields.char("E-mail", size=64),
+ 'email': fields.char("Email, size=64),
'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
'response': fields.many2one('survey.response', 'Answer'),
'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1)
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 8c7fabca427..15e2b56a1be 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -435,7 +435,7 @@ class survey_question_wiz(osv.osv_memory):
def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
"""
- If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey then send mail on responsible person of this survey and attach survey answer report in pdf format.
+ If any user give answer of survey then last create report of this answer and if 'Email Notification on Answer' set True in survey then send mail on responsible person of this survey and attach survey answer report in pdf format.
"""
if not report_name or not res_ids:
return (False, Exception('Report name and Resources ids are required !!!'))
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index ad055c70c19..3df1f2af713 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -191,7 +191,7 @@ class survey_send_invitation(osv.osv_memory):
if skipped:
note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
if error:
- note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
+ note += 'Email not send successfully:\n====================\n%s\n' % (error)
context.update({'note' : note})
return {
'view_type': 'form',