[IMP]crm-warning-msg

bzr revid: pna@tinyerp.com-20120712055038-06rgow7j1sgae6v6

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 Email 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):

addons/crm/crm_lead.py

@@ -784,7 +784,7 @@ class crm_lead(base_stage, osv.osv):
         for lead in self.browse(cr, uid, ids, context):
             if (not lead.section_id.allow_unlink) and (lead.state != 'draft'):
                 raise osv.except_osv(_('Error'),
-                    _("You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. " \
+                    _("You cannot delete lead '%s'; because it's not in 'Draft' state " \
                       "You should better cancel it, instead of deleting it.") % lead.name)
         return super(crm_lead, self).unlink(cr, uid, ids, context)
 

addons/crm/i18n/crm.pot

@@ -110,7 +110,7 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
-msgid "Can not add note!"
+msgid "Cannot add note."
 msgstr ""
 
 #. module: crm
@@ -802,7 +802,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:832
 #, python-format
 msgid ""
-"You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
+"You cannot delete lead '%s'; because it's not in 'Draft' state You "
 "should better cancel it, instead of deleting it."
 msgstr ""
 
@@ -3184,7 +3184,7 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
-msgid "Closed/Cancelled Leads can not be converted into Opportunity"
+msgid "Closed/Cancelled Leads cannot be converted into Opportunity."
 msgstr ""
 
 #. module: crm
@@ -3273,7 +3273,7 @@ msgstr ""
 
 #. module: crm
 #: constraint:crm.segmentation:0
-msgid "Error ! You can not create recursive profiles."
+msgid "Error ! You cannot create recursive profiles."
 msgstr ""
 
 #. module: crm
@@ -3401,7 +3401,7 @@ msgstr ""
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
-msgid "No Email Found for your Company address!"
+msgid "No Email Found for your Company address."
 msgstr ""
 
 #. module: crm

addons/crm/wizard/crm_add_note.py

@@ -25,7 +25,7 @@ class crm_add_note(osv.osv_memory):
             context = {}
 
         if not context.get('active_model'):
-            raise osv.except_osv(_('Error'), _('Can not add note!'))
+            raise osv.except_osv(_('Error'), _('Cannot add note.'))
 
         model = context.get('active_model')
         case_pool = self.pool.get(model)

addons/crm/wizard/crm_lead_to_opportunity.py

@@ -99,7 +99,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         lead_obj = self.pool.get('crm.lead')
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads cannot be converted into Opportunity."))
         return False
 
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):

addons/crm_partner_assign/i18n/crm_partner_assign.pot

@@ -115,7 +115,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/partner_geo_assign.py:37
 #, python-format
-msgid "Could not contact geolocation servers, please make sure you have a working internet connection (%s)"
+msgid "Cannot contact geolocation servers, please make sure you have a working internet connection (%s)."
 msgstr ""
 
 #. module: crm_partner_assign

addons/crm_partner_assign/partner_geo_assign.py

@@ -34,7 +34,7 @@ def geo_find(addr):
         xml = urllib.urlopen(url).read()
     except Exception, e:
         raise osv.except_osv(_('Network error'),
-                             _('Could not contact geolocation servers, please make sure you have a working internet connection (%s)') % e)
+                             _('Cannot contact geolocation servers, please make sure you have a working internet connection (%s).') % e)
 
     if '<error>' in xml:
         return None

addons/crm_profiling/crm_profiling.py

@@ -234,7 +234,7 @@ class crm_segmentation(osv.osv):
         }
 
     _constraints = [
-        (osv.osv._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id'])
+        (osv.osv._check_recursion, 'Error ! You cannot create recursive profiles.', ['parent_id'])
     ]
 
     def process_continue(self, cr, uid, ids, start=False):

addons/crm_profiling/i18n/crm_profiling.pot

@@ -129,7 +129,7 @@ msgstr ""
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
-msgid "Error ! You can not create recursive profiles."
+msgid "Error ! You cannot create recursive profiles."
 msgstr ""
 
 #. module: crm_profiling