diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index f701b737d7b..505aaf232ed 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -218,7 +218,7 @@ class account_analytic_plan_instance(osv.osv): pids = ana_plan_instance_obj.search(cr, uid, [('name','=',vals['name']), ('code','=',vals['code']), ('plan_id','<>',False)], context=context) if pids: - raise osv.except_osv(_('Error!'), _('A model having same name and code.')) + raise osv.except_osv(_('Error!'), _('A model having this name and code already exists !')) res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)], context=context) for i in res: diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot index b36f4db2087..75b4654850e 100644 --- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot +++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot @@ -183,7 +183,7 @@ msgstr "" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format -msgid "A model having same name and code." +msgid "A model having this name and code already exists !" msgstr "" #. module: account_analytic_plans diff --git a/addons/document/document.py b/addons/document/document.py index a8994992717..27abb92c80c 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -61,7 +61,7 @@ class document_file(osv.osv): return False if ids is not None: - raise NotImplementedError("Ids is just there by convention,please donot use it yet.") + raise NotImplementedError("Ids is just there by convention,please do not use it.") cr.execute("UPDATE ir_attachment " \ "SET parent_id = %s, db_datas = decode(encode(db_datas,'escape'), 'base64') " \ diff --git a/addons/event/event.py b/addons/event/event.py index e8c6eb31e3e..114432493a5 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -365,7 +365,7 @@ class event_registration(osv.osv): self.write(cr, uid, ids, values) self.message_append(cr, uid, ids, _('State set to Done'), body_text=_('Done')) else: - raise osv.except_osv(_('Error!'),_("You must wait the event starting day to do this action.") ) + raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") ) return True def button_reg_cancel(self, cr, uid, ids, context=None, *args): diff --git a/addons/google_base_account/i18n/google_base_account.pot b/addons/google_base_account/i18n/google_base_account.pot index 5a56073a7e7..41693f54adf 100644 --- a/addons/google_base_account/i18n/google_base_account.pot +++ b/addons/google_base_account/i18n/google_base_account.pot @@ -106,7 +106,7 @@ msgstr "" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:75 #, python-format -msgid "Authentication fail check the user and password !" +msgid "Authentication failed check the user and password !" msgstr "" #. module: google_base_account diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py index b6cb4f185b9..756657f001f 100644 --- a/addons/google_base_account/wizard/google_login.py +++ b/addons/google_base_account/wizard/google_login.py @@ -74,7 +74,7 @@ class google_login(osv.osv_memory): } self.pool.get('res.users').write(cr, uid, uid, res, context=context) else: - raise osv.except_osv(_('Error'), _("Authentication fail check the user and password !")) + raise osv.except_osv(_('Error'), _("Authentication failed check the user and password !")) return self._get_next_action(cr, uid, context=context) diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index ab370f63397..16f3530c1e9 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -137,7 +137,7 @@ class hr_employee(osv.osv): warning_sign = "Sign Out" for emp in self.read(cr, uid, ids, ['id'], context=context): if not self._action_check(cr, uid, emp['id'], dt, context): - raise osv.except_osv(_('Warning !'), _('You try to %s with a date before to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,)) + raise osv.except_osv(_('Warning !'), _('You tried to %s with a date anterior to another event !\nTry to contact the administrator to correct attendances.')%(warning_sign,)) res = {'action': type, 'employee_id': emp['id']} if dt: diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py index 07742ed5fe4..90f42d8487a 100644 --- a/addons/hr_contract/hr_contract.py +++ b/addons/hr_contract/hr_contract.py @@ -97,7 +97,7 @@ class hr_contract(osv.osv): return True _constraints = [ - (_check_dates, 'Error! Contract start-date must be lower then contract end-date.', ['date_start', 'date_end']) + (_check_dates, 'Error! Contract start-date must be less than contract end-date.', ['date_start', 'date_end']) ] hr_contract() diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot index 016fef341ae..f444a602208 100644 --- a/addons/hr_contract/i18n/hr_contract.pot +++ b/addons/hr_contract/i18n/hr_contract.pot @@ -234,7 +234,7 @@ msgstr "" #. module: hr_contract #: constraint:hr.contract:0 -msgid "Error! Contract start-date must be lower then contract end-date." +msgid "Error! Contract start-date must be less than contract end-date." msgstr "" #. module: hr_contract diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index d3e410bab1c..decdf56eb47 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -240,7 +240,7 @@ class hr_evaluation(osv.osv): self.write(cr, uid, ids, {'state':'progress'}, context=context) for id in self.browse(cr, uid, ids, context=context): if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', 'in', ['done','cancel'])], context=context)): - raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state.")) + raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state.")) return True def button_done(self,cr, uid, ids, context=None): diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot index c6c8e63dd72..0b52d0ced50 100644 --- a/addons/hr_evaluation/i18n/hr_evaluation.pot +++ b/addons/hr_evaluation/i18n/hr_evaluation.pot @@ -812,7 +812,7 @@ msgstr "" #: code:addons/hr_evaluation/hr_evaluation.py:244 #, python-format msgid "" -"You cannot change state, because some appraisal in waiting answer or draft." +"You cannot change state, because some appraisal(s) are in waiting answer or draft state." "state" msgstr ""