diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index 908bca04f70..ce3c92e1cf1 100644 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -286,7 +286,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:296 #, python-format -msgid "All E-mails have been successfully sent to Partners:.\n" +msgid "All Emails have been successfully sent to Partners:.\n" "\n" "%s" msgstr "" @@ -326,7 +326,7 @@ msgstr "" #, python-format msgid "\n" "\n" -"E-Mail sent to following Partners successfully. !\n" +"Email sent to following Partners successfully. !\n" "\n" "%s" msgstr "" @@ -522,7 +522,7 @@ msgstr "" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format -msgid "E-Mail not sent to following Partners, E-mail not available !\n" +msgid "Email not sent to following Partners, Email not available !\n" "\n" "%s" msgstr "" diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 088ff868ca0..69b970e2538 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -289,15 +289,15 @@ class account_followup_print_all(osv.osv_memory): msg += partner.name + '\n' msg_unsent += msg if not msg_unsent: - summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent + summary = _("All Emails have been successfully sent to Partners:.\n\n%s") % msg_sent else: - msg_unsent = _("E-Mail not sent to following Partners, E-mail not available !\n\n%s") % msg_unsent - msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent + msg_unsent = _("Email not sent to following Partners, Email not available !\n\n%s") % msg_unsent + msg_sent = msg_sent and _("\n\nEmail sent to following Partners successfully. !\n\n%s") % msg_sent line = '==========================================================================' summary = msg_unsent + line + msg_sent context.update({'summary': summary}) else: - context.update({'summary': '\n\n\nE-Mail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'}) + context.update({'summary': '\n\n\nEmail has not been sent to any partner. If you want to send it, please tick send email confirmation on wizard.'}) return { 'name': _('Followup Summary'), diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index b208864700b..1a3d96cbc33 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -327,7 +327,7 @@ the rule to mark CC(mail to any other person defined in actions)."), reply_to = emailfrom if not emailfrom: raise osv.except_osv(_('Error!'), - _("No E-Mail ID Found for your Company address!")) + _("No Email ID Found for your Company address!")) return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id) diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot index ee3c87629b1..9b09e28a1f3 100644 --- a/addons/base_action_rule/i18n/base_action_rule.pot +++ b/addons/base_action_rule/i18n/base_action_rule.pot @@ -286,7 +286,7 @@ msgstr "" #. module: base_action_rule #: code:addons/base_action_rule/base_action_rule.py:329 #, python-format -msgid "No E-Mail ID Found for your Company address!" +msgid "No Email ID Found for your Company address!" msgstr "" #. module: base_action_rule diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index ec489ff4d14..db77719a85b 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -59,7 +59,7 @@ class base_action_rule(osv.osv): else: reply_to = emailfrom if not emailfrom: - raise osv.except_osv(_('Error!'), _("No E-Mail Found for your Company address!")) + raise osv.except_osv(_('Error!'), _("No Email Found for your Company address!")) return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id) def do_check(self, cr, uid, action, obj, context=None): diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index bab3e4bca5f..4ca40a691f5 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -11,7 +11,7 @@ direct - e-mail + email Sales Department diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index addd26785a1..fa4643db156 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -193,7 +193,7 @@ class crm_lead(base_stage, osv.osv): 'active': fields.boolean('Active', required=False), 'date_action_last': fields.datetime('Last Action', readonly=1), 'date_action_next': fields.datetime('Next Action', readonly=1), - 'email_from': fields.char('Email', size=128, help="E-mail address of the contact", select=1), + 'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='When sending mails, the default email address is taken from the sales team.'), 'create_date': fields.datetime('Creation Date' , readonly=True), diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 8fc6beabe8b..7f8cbdf77aa 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -263,7 +263,7 @@ - + Lucie Vonck diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 85e1f493643..f3d70b709af 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -540,7 +540,7 @@ msgstr "" #. module: crm #: field:crm.lead,email:0 -msgid "E-Mail" +msgid "Email" msgstr "" #. module: crm @@ -2675,7 +2675,7 @@ msgstr "" #. module: crm #: help:crm.lead,email_from:0 -msgid "E-mail address of the contact" +msgid "Email address of the contact" msgstr "" #. module: crm @@ -3401,7 +3401,7 @@ msgstr "" #. module: crm #: code:addons/crm/crm_action_rule.py:61 #, python-format -msgid "No E-Mail Found for your Company address!" +msgid "No Email Found for your Company address!" msgstr "" #. module: crm @@ -3563,7 +3563,7 @@ msgstr "" #. module: crm #: model:ir.model,name:crm.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: crm diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot index 8e36d36aebd..3fb9fc0e915 100644 --- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot +++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot @@ -832,7 +832,7 @@ msgstr "" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: crm_partner_assign diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index dbe53b3d547..c426e3ae746 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -21,7 +21,7 @@ ############################################################################## { - "name" : "E-Mail Templates", + "name" : "Email Templates", "version" : "1.1", "author" : "OpenERP,OpenLabs", "website" : "http://openerp.com", diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot index ba3e4c1386f..0990a940397 100644 --- a/addons/email_template/i18n/email_template.pot +++ b/addons/email_template/i18n/email_template.pot @@ -173,7 +173,7 @@ msgstr "" #. module: email_template #: model:ir.model,name:email_template.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: email_template diff --git a/addons/hr/hr.py b/addons/hr/hr.py index e2bca73a72e..a03acc877d4 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -190,7 +190,7 @@ class hr_employee(osv.osv): 'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"), 'work_phone': fields.char('Work Phone', size=32, readonly=False), 'mobile_phone': fields.char('Work Mobile', size=32, readonly=False), - 'work_email': fields.char('Work E-mail', size=240), + 'work_email': fields.char('Work Email', size=240), 'work_location': fields.char('Office Location', size=32), 'notes': fields.text('Notes'), 'parent_id': fields.many2one('hr.employee', 'Manager'), diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 42effb62e6e..f2b1b363204 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -249,7 +249,7 @@ msgstr "" #. module: hr #: field:hr.employee,work_email:0 -msgid "Work E-mail" +msgid "Work Email" msgstr "" #. module: hr diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot index 7c0cac507ad..83d186f48c3 100644 --- a/addons/hr_evaluation/i18n/hr_evaluation.pot +++ b/addons/hr_evaluation/i18n/hr_evaluation.pot @@ -307,7 +307,7 @@ msgstr "" #. module: hr_evaluation #: model:ir.model,name:hr_evaluation.model_mail_compose_message -msgid "E-mail composition wizard" +msgid "Email composition wizard" msgstr "" #. module: hr_evaluation diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako index 96d94bedc6e..b3412032cba 100644 --- a/addons/l10n_ch/report/bvr.mako +++ b/addons/l10n_ch/report/bvr.mako @@ -116,7 +116,7 @@ ${_("Fax") |entity}: ${inv.partner_id.fax|entity} %endif %if inv.partner_id.email : - ${_("E-mail") |entity}: ${inv.partner_id.email|entity} + ${_("Email") |entity}: ${inv.partner_id.email|entity} %endif %if inv.partner_id.vat : ${_("VAT") |entity}: ${inv.partner_id.vat|entity} diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako index 369799c0d44..cd6e2df6c26 100644 --- a/addons/l10n_ch/report/report_webkit_html.mako +++ b/addons/l10n_ch/report/report_webkit_html.mako @@ -23,7 +23,7 @@ ${_("Fax") |entity}: ${inv.partner_id.fax|entity} %endif %if inv.partner_id.email : - ${_("E-mail") |entity}: ${inv.partner_id.email|entity} + ${_("Email") |entity}: ${inv.partner_id.email|entity} %endif %if inv.partner_id.vat : ${_("VAT") |entity}: ${inv.partner_id.vat|entity} diff --git a/addons/l10n_ch/report/report_webkit_html_view.xml b/addons/l10n_ch/report/report_webkit_html_view.xml index 19f73715f98..936837348e4 100644 --- a/addons/l10n_ch/report/report_webkit_html_view.xml +++ b/addons/l10n_ch/report/report_webkit_html_view.xml @@ -42,7 +42,7 @@ ${company.partner_id and company.partner_id.street2 or ''|entity}${_('Fax')}:${company.partner_id and company.partner_id.fax or ''|entity} - ${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}${_('e-mail')}:${company.partner_id and company.partner_id.email or ''|entity} + ${company.partner_id and company.partner_id.zip or ''|entity} ${company.partner_id and company.partner_id.city or ''|entity}${_('email')}:${company.partner_id and company.partner_id.email or ''|entity} ${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 -