diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 64d048783c4..6d046f57de7 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 import tools
 import time
 from tools.config import config
+from tools.translate import _
 import netsvc
 import re
 
diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py
index dd1934de698..b1a1eef9e4c 100644
--- a/bin/addons/base/ir/ir_attachment.py
+++ b/bin/addons/base/ir/ir_attachment.py
@@ -33,7 +33,8 @@ class ir_attachment(osv.osv):
             ids = [ids]
         cr.execute('select distinct res_model from ir_attachment where id in ('+','.join(map(str, ids))+')')
         for obj in cr.fetchall():
-            ima.check(cr, uid, obj[0], mode)
+            if obj[0]:
+                ima.check(cr, uid, obj[0], mode)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 958dd4845db..05fe09d2b87 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -28,6 +28,7 @@ from osv.orm import except_orm, browse_record
 import time
 import tools
 from tools import config
+from tools.translate import _
 import pooler
 
 def _get_fields_type(self, cr, uid, context=None):
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 7867afa7b92..c6042effc4b 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -36,6 +36,7 @@ import pooler
 import netsvc
 
 from tools.parse_version import parse_version
+from tools.translate import _
 
 
 class module_repository(osv.osv):
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index a7e3ceba627..0d21f1eecbe 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -6,23 +6,23 @@
             <field name="wiz_name">base.module.import</field>
         </record>
         <menuitem action="wizard_base_module_import" id="menu_wizard_module_import" parent="menu_management" type="wizard"/>
-        
+
         <record id="wizard_update" model="ir.actions.wizard">
             <field name="name">Update Modules List</field>
             <field name="wiz_name">module.module.update</field>
         </record>
         <menuitem action="wizard_update" icon="STOCK_CONVERT" id="menu_module_update" parent="menu_management" type="wizard"/>
-        
+
         <wizard id="wizard_upgrade" model="ir.module.module" name="module.upgrade" string="Apply Scheduled Upgrades"/>
         <menuitem action="wizard_upgrade" id="menu_wizard_upgrade" parent="menu_management" type="wizard"/>
-        
+
         <record id="wizard_lang_install" model="ir.actions.wizard">
             <field name="name">Load an Official Translation</field>
             <field name="wiz_name">module.lang.install</field>
         </record>
         <menuitem action="wizard_lang_install" id="menu_wizard_lang_install" parent="menu_translation" type="wizard"/>
 
-				<record id="wizard_lang_export" model="ir.ui.view">
+        <record id="wizard_lang_export" model="ir.ui.view">
             <field name="name">Export a Translation File</field>
             <field name="model">wizard.module.lang.export</field>
             <field name="type">form</field>
@@ -32,7 +32,7 @@
                         <page string="Export Data">
                             <group col="2" fill="0" states="choose">
                                 <separator colspan="2" string="Export translation file"/>
-                                <field name="lang" required="1" width="300"/>
+                                <field name="lang" width="300"/>
                                 <field name="format" required="1"/>
                                 <field height="200" name="modules" width="500"/>
                                 <field invisible="1" name="state"/>
@@ -105,6 +105,6 @@
             <field name="target">new</field>
         </record>
         <menuitem action="action_wizard_update_translations" id="menu_wizard_update_translations" parent="menu_translation_app"/>
-         
+
     </data>
 </openerp>
diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py
index 2a56cac2fcc..58de337f45e 100644
--- a/bin/addons/base/module/wizard/wizard_export_lang.py
+++ b/bin/addons/base/module/wizard/wizard_export_lang.py
@@ -27,7 +27,7 @@ import cStringIO
 import csv
 import pooler
 from osv import fields,osv
-
+from tools.translate import _
 
 class wizard_export_lang(osv.osv_memory):
 
@@ -60,8 +60,10 @@ class wizard_export_lang(osv.osv_memory):
         elif this.format == 'tgz':
             ext = this.lang and '.po' or '.pot'
             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)
+        filename = _('new')
+        if not this.lang and len(mods) == 1:
+            filename = mods[0]
+        this.name = "%s.%s" % (this.lang or filename, 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)
diff --git a/bin/addons/base/module/wizard/wizard_module_import.py b/bin/addons/base/module/wizard/wizard_module_import.py
index fbf66d4c222..b8ddcd6269c 100644
--- a/bin/addons/base/module/wizard/wizard_module_import.py
+++ b/bin/addons/base/module/wizard/wizard_module_import.py
@@ -30,6 +30,7 @@ import tools
 import zipfile
 from StringIO import StringIO
 import base64
+from tools.translate import _
 
 finish_form ='''<?xml version="1.0"?>
 <form string="Module import">
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 97c2ed45ac3..d0c3cf85e9d 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -26,6 +26,7 @@ from osv import fields,osv
 import tools
 import ir
 import pooler
+from tools.translate import _
 
 class res_partner_function(osv.osv):
     _name = 'res.partner.function'
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e2d438ea6a3..ec96b07dc0c 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -24,6 +24,7 @@ from osv import fields,osv
 from osv.orm import except_orm
 import tools
 import pytz
+from tools.translate import _
 
 class groups(osv.osv):
     _name = "res.groups"
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index beb1a2487a4..2fd6d5cb987 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -37,6 +37,7 @@
             <rng:optional><rng:attribute name="position"/></rng:optional>
             <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:optional><rng:attribute name="type"/></rng:optional>
+            <rng:optional><rng:attribute name="min_rows"/></rng:optional>
             <rng:optional><rng:attribute name="on_write"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 9e2d1f51dae..4dd11c5a71c 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -756,7 +756,6 @@ def get_languages():
         'de_DE': u'German / Deutsch',
         'el_EL': u'Greek / Ελληνικά',
         'en_CA': u'English (CA)',
-        'en_EN': u'English (default)',
         'en_GB': u'English (UK)',
         'en_US': u'English (US)',
         'es_AR': u'Spanish (AR) / Español (AR)',