From 411f8d3d240128917f33c025be670dcf677da464 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Tue, 20 Jan 2009 19:24:09 +0530
Subject: [PATCH] Misc. changes

bzr revid: jvo@tinyerp.com-20090120135409-4ain027j7gxcfig3
---
 bin/tools/convert.py   | 6 +++---
 bin/tools/misc.py      | 2 +-
 bin/tools/translate.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index f7f8c596c84..8993968658a 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -179,7 +179,7 @@ class assertion_report(object):
     def record_assertion(self, success, severity):
         """
             Records the result of an assertion for the failed/success count
-            retrurns success
+            returns success
         """
         if severity in self._report:
             self._report[severity][success] += 1
@@ -836,7 +836,7 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
             datas.append(map(lambda x: misc.ustr(x), line))
         except:
             logger = netsvc.Logger()
-            logger.notifyChannel("init", netsvc.LOG_ERROR, "Can not import the line: %s" % line)
+            logger.notifyChannel("init", netsvc.LOG_ERROR, "Cannot import the line: %s" % line)
     pool.get(model).import_data(cr, uid, fields, datas,mode, module,noupdate,filename=fname_partial)
     if config.get('import_partial'):
         data = pickle.load(file(config.get('import_partial')))
@@ -858,7 +858,7 @@ def convert_xml_import(cr, module, xmlfile, idref=None, mode='init', noupdate=Fa
         relaxng.assert_(doc)
     except Exception, e:
         logger = netsvc.Logger()
-        logger.notifyChannel('init', netsvc.LOG_ERROR, 'The XML file do not fit the required schema !')
+        logger.notifyChannel('init', netsvc.LOG_ERROR, 'The XML file does not fit the required schema !')
         logger.notifyChannel('init', netsvc.LOG_ERROR, relaxng.error_log.last_error)
         raise
 
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 3efac8998e6..d99dd0dfe4a 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -299,7 +299,7 @@ def reverse_enumerate(l):
 #----------------------------------------------------------
 # Emails
 #----------------------------------------------------------
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False, attach=None, tinycrm=False, ssl=False, debug=False,subtype='plain'):
+def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False, attach=None, tinycrm=False, ssl=False, debug=False, subtype='plain'):
     """Send an email."""
     import smtplib
     from email.MIMEText import MIMEText
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 1b91d24c278..f3f6c4849cb 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -148,7 +148,7 @@ class TinyPoFile(object):
     def write_infos(self, modules):
         import release
         self.buffer.write("# Translation of %(project)s.\n" \
-                          "# This file containt the translation of the following modules:\n" \
+                          "# This file contains the translation of the following modules:\n" \
                           "%(modules)s" \
                           "#\n" \
                           "msgid \"\"\n" \