[MERGE] Merged SSU's branch of warning messages improvements

bzr revid: pso@tinyerp.com-20120801063734-4p0ywsoc0ekx07w0

23 files changed, 27 insertions, 27 deletions

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..a4ac4a81c45 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..51e4eea8c2c 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 ""
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 6a0c24b553e..73a4368caaf 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -315,7 +315,7 @@ class hr_timesheet_sheet(osv.osv):
     def check_sign(self, cr, uid, ids, typ, context=None):
         sheet = self.browse(cr, uid, ids, context=context)[0]
         if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from an other date than today.'))
+            raise osv.except_osv(_('Error !'), _('You cannot sign in/sign out from other date than today.'))
         return True
 
     def sign(self, cr, uid, ids, typ, context=None):
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 8149ce4ec92..2bf91768bad 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -971,7 +971,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
-msgid "You cannot sign in/sign out from an other date than today."
+msgid "You cannot sign in/sign out from other date than today."
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/import_google/i18n/import_google.pot b/addons/import_google/i18n/import_google.pot
index de5a0a257ec..175b8c1b75d 100644
--- a/addons/import_google/i18n/import_google.pot
+++ b/addons/import_google/i18n/import_google.pot
@@ -33,8 +33,8 @@ msgstr ""
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:71
 #, python-format
-msgid "No Google username or password is defined for user.\n"
-"Please define in user view."
+msgid "No Google Username or password is defined for user.\n"
+"Please define on user's form."
 msgstr ""
 
 #. module: import_google
diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py
index 32ef6f82534..324f11293f5 100644
--- a/addons/import_google/wizard/import_google_data.py
+++ b/addons/import_google/wizard/import_google_data.py
@@ -73,7 +73,7 @@ class synchronize_google(osv.osv_memory):
             user_obj = self.pool.get('res.users').browse(cr, uid, uid,context=context)
             google=self.pool.get('google.login')
             if not user_obj.gmail_user or not user_obj.gmail_password:
-                raise osv.except_osv(_('Warning !'), _("No Google username or password is defined for user.\nPlease define in user view."))
+                raise osv.except_osv(_('Warning !'), _("No Google Username or password is defined for user.\nPlease define on user's form."))
             gd_client = google.google_login(user_obj.gmail_user,user_obj.gmail_password,type='group')
             if not gd_client:
                 return [('failed', 'Connection to google fail')]
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index 0cd82aaca0c..4642c7cc917 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -164,7 +164,7 @@ msgstr ""
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:486
 #, python-format
-msgid "There is no Operation to be cancelled!"
+msgid "No operation to cancel."
 msgstr ""
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 2700ed2654d..8692dab5c87 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -533,7 +533,7 @@ class mrp_operations_operation(osv.osv):
                   return False
             if code.start_stop=='cancel':
                if  not 'start' in code_lst :
-                   raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled!'))
+                   raise osv.except_osv(_('Error!'),_('No operation to cancel.'))
                    return False
                if 'done' in code_lst:
                   raise osv.except_osv(_('Error!'),_('Operation is already finished!'))
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index b270870c33f..d0b77b2ea66 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -443,7 +443,7 @@ msgstr ""
 #. module: purchase
 #: code:addons/purchase/purchase.py:499
 #, python-format
-msgid "First cancel all receptions related to this purchase order."
+msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 17e2c4151bf..dbf3f89dc56 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -503,7 +503,7 @@ class purchase_order(osv.osv):
                 if inv and inv.state not in ('cancel','draft'):
                     raise osv.except_osv(
                         _('Unable to cancel this purchase order.'),
-                        _('First cancel all receptions related to this purchase order.'))
+                        _('You must first cancel all receptions related to this purchase order.'))
                 if inv:
                     wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index d6e213c3936..19f86364672 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -131,7 +131,7 @@ msgstr ""
 #: code:addons/sale/sale.py:295
 #, python-format
 msgid ""
-"In order to delete a confirmed sales order, you must cancel it before ! To "
+"In order to delete a confirmed sales order, you must cancel it! To "
 "cancel a sale order, you must first cancel related picking for delivery "
 "orders."
 msgstr ""
@@ -1492,7 +1492,7 @@ msgstr ""
 #. module: sale
 #: code:addons/sale/sale.py:604
 #, python-format
-msgid "First cancel all picking attached to this sales order."
+msgid "You must first cancel all delivery order(s) attached to this sales order."
 msgstr ""
 
 #. module: sale
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8ea9eb151b9..21f5d34ced7 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -295,7 +295,7 @@ class sale_order(osv.osv):
             if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it before ! To cancel a sale order, you must first cancel related picking for delivery orders.'))
+                raise osv.except_osv(_('Invalid action !'), _('In order to delete a confirmed sales order, you must cancel it! To cancel a sale order, you must first cancel related picking for delivery orders.'))
 
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
@@ -703,7 +703,7 @@ class sale_order(osv.osv):
                 if pick.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
                         _('Cannot cancel sales order!'),
-                        _('First cancel all picking attached to this sales order.'))
+                        _('You must first cancel all delivery order(s) attached to this sales order.'))
                 if pick.state == 'cancel':
                     for mov in pick.move_lines:
                         proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
@@ -1210,7 +1210,7 @@ class sale_order_line(osv.osv):
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
             if not account_id:
                 raise osv.except_osv(_('Error !'),
-                            _('Please define Fiscal Position or income category account for Product Categories default Properties.'))
+                            _('There is no Fiscal Position defined or Income category account defined for default properties of Product categories.'))
             return {
                 'name': line.name,
                 'origin': line.order_id.name,
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 6e75333fc92..9b46cdde703 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -2842,7 +2842,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
 #: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
-msgid "Please provide proper quantity."
+msgid "Please provide proper Quantity."
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 728e3d0047e..d8520002b52 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -167,7 +167,7 @@ class stock_partial_picking(osv.osv_memory):
 
             #Quantiny must be Positive
             if wizard_line.quantity < 0:
-                raise osv.except_osv(_('Warning!'), _('Please provide proper quantity.'))
+                raise osv.except_osv(_('Warning!'), _('Please provide proper Quantity.'))
 
             #Compute the quantity for respective wizard_line in the line uom (this jsut do the rounding if necessary)
             qty_in_line_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, line_uom.id)