Merge commit 'origin/master' into mdv-gpl3-fwd

Conflicts:

	bin/addons/base/ir/ir_actions.py
	bin/netsvc.py
	bin/report/report_sxw.py
	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20081218164925-uarehzvo3ocu0x2w

1 files changed, 0 insertions, 3 deletions

diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py
index c6ce9f75e19..7e1454bf25e 100644
--- a/bin/addons/base/module/wizard/wizard_export_lang.py
+++ b/bin/addons/base/module/wizard/wizard_export_lang.py
@@ -26,7 +26,6 @@ import base64
 import StringIO
 import csv
 import pooler
-
 from osv import fields,osv
 
 
@@ -51,7 +50,6 @@ class wizard_export_lang(osv.osv_memory):
         mods = map(lambda m: m.name, this.modules) or ['all']
         mods.sort()
         buf=StringIO.StringIO()
-    
         tools.trans_export(this.lang, mods, buf, this.format, dbname=cr.dbname)
         if this.format == 'csv':
             this.advice = _("Save this document to a .CSV file and open it with your favourite spreadsheet software. The file encoding is UTF-8. You have to translate the latest column before reimporting it.")
@@ -64,7 +62,6 @@ class wizard_export_lang(osv.osv_memory):
             this.advice = _('Save this document to a .tgz file. This archive containt UTF-8 %s files and may be uploaded to launchpad.') % (ext,)
        
         this.name = "%s.%s" % (this.lang or _('new'), this.format)
-
         out=base64.encodestring(buf.getvalue())
         buf.close()
         return self.write(cr, uid, ids, {'state':'get', 'data':out, 'advice':this.advice, 'name':this.name}, context=context)