diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 8ec1bea2d02..8e406519d15 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -766,7 +766,7 @@ class ir_actions_todo(osv.osv):
         'action_id': fields.many2one(
             'ir.actions.actions', 'Action', select=True, required=True),
         'sequence': fields.integer('Sequence'),
-        'state': fields.selection(TODO_STATES, string='State', required=True),
+        'state': fields.selection(TODO_STATES, string='Status', required=True),
         'name': fields.char('Name', size=64),
         'type': fields.selection(TODO_TYPES, 'Type', required=True,
             help="""Manual: Launched manually.
diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py
index 3ed61a7ddb3..4e275f902cc 100644
--- a/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@ -167,7 +167,7 @@ class ir_translation(osv.osv):
             [('to_translate','To Translate'),
              ('inprogress','Translation in Progress'),
              ('translated','Translated')],
-            string="State",
+            string="Status",
             help="Automatically set to let administators find new terms that might need to be translated"),
 
         # aka gettext extracted-comments - we use them to flag openerp-web translation
diff --git a/openerp/addons/base/ir/workflow/workflow.py b/openerp/addons/base/ir/workflow/workflow.py
index ce9adfd8ecc..46884c5035b 100644
--- a/openerp/addons/base/ir/workflow/workflow.py
+++ b/openerp/addons/base/ir/workflow/workflow.py
@@ -136,7 +136,7 @@ class wkf_instance(osv.osv):
         'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
         'res_id': fields.integer('Resource ID'),
         'res_type': fields.char('Resource Object', size=64),
-        'state': fields.char('State', size=32),
+        'state': fields.char('Status', size=32),
     }
     def _auto_init(self, cr, context=None):
         super(wkf_instance, self)._auto_init(cr, context)
@@ -159,7 +159,7 @@ class wkf_workitem(osv.osv):
         'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
         'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
         'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
-        'state': fields.char('State', size=64, select=True),
+        'state': fields.char('Status', size=64, select=True),
     }
 wkf_workitem()
 
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index d174928556f..5c262299917 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -344,7 +344,7 @@
         <field name="model">workflow.workitem</field>
         <field name="arch" type="xml">
             <search string="Workflow Workitems">
-                <field name="state" string="State"/>
+                <field name="state" string="Status"/>
                 <filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
                 <field name="wkf_id"/>
                 <field name="act_id"/>
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index e86bcc15d74..5fbb28d36db 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -223,7 +223,7 @@ class module(osv.osv):
             ('to upgrade','To be upgraded'),
             ('to remove','To be removed'),
             ('to install','To be installed')
-        ], string='State', readonly=True, select=True),
+        ], string='Status', readonly=True, select=True),
         'demo': fields.boolean('Demo Data', readonly=True),
         'license': fields.selection([
                 ('GPL-2', 'GPL Version 2'),
@@ -671,7 +671,7 @@ class module_dependency(osv.osv):
             ('to remove','To be removed'),
             ('to install','To be installed'),
             ('unknown', 'Unknown'),
-            ], string='State', readonly=True, select=True),
+            ], string='Status', readonly=True, select=True),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/module/wizard/base_language_install.py b/openerp/addons/base/module/wizard/base_language_install.py
index ab65159f0d4..fd25a84f196 100644
--- a/openerp/addons/base/module/wizard/base_language_install.py
+++ b/openerp/addons/base/module/wizard/base_language_install.py
@@ -31,7 +31,7 @@ class base_language_install(osv.osv_memory):
     _columns = {
         'lang': fields.selection(tools.scan_languages(),'Language', required=True),
         'overwrite': fields.boolean('Overwrite Existing Terms', help="If you check this box, your customized translations will be overwritten and replaced by the official ones."),
-        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+        'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
     }
     _defaults = {
         'state': 'init',
diff --git a/openerp/addons/base/module/wizard/base_module_import.py b/openerp/addons/base/module/wizard/base_module_import.py
index 34f22bf82f0..8734a5e0032 100644
--- a/openerp/addons/base/module/wizard/base_module_import.py
+++ b/openerp/addons/base/module/wizard/base_module_import.py
@@ -38,7 +38,7 @@ class base_module_import(osv.osv_memory):
     _columns = {
           'module_file': fields.binary('Module .ZIP file', required=True),
           'state':fields.selection([('init','init'),('done','done')],
-                                   'state', readonly=True),
+                                   'Status', readonly=True),
           'module_name': fields.char('Module Name', size=128),
     }
 
diff --git a/openerp/addons/base/module/wizard/base_module_update.py b/openerp/addons/base/module/wizard/base_module_update.py
index 0893761cd28..fc9b0749cb3 100644
--- a/openerp/addons/base/module/wizard/base_module_update.py
+++ b/openerp/addons/base/module/wizard/base_module_update.py
@@ -29,7 +29,7 @@ class base_module_update(osv.osv_memory):
     _columns = {
         'update': fields.integer('Number of modules updated', readonly=True),
         'add': fields.integer('Number of modules added', readonly=True),
-        'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
+        'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
     }
 
     _defaults = {  
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index 52c8b64ba34..47b665426f9 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -45,7 +45,7 @@
             <field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
         </record>
 
-        <menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
+        <menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
 
         <menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0" groups="base.group_no_one"/>
 
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index e51c4dc2e6b..dadf8aba7fe 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -116,7 +116,7 @@
             <field eval="1" name="supplier"/>
             <field name="is_company">1</field>
             <field name="city">Fremont</field>
-            <field name="zip">CA 94538</field>
+            <field name="zip">94538</field>
             <field name="country_id" ref="base.us"/>
             <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
             <field name="street">3661 Station Street</field>
@@ -148,7 +148,7 @@
             <field eval="0" name="customer"/>
             <field name="is_company">1</field>
             <field name="city">Chicago</field>
-            <field name="zip">IL 60623</field>
+            <field name="zip">60623</field>
             <field name="country_id" ref="base.us"/>
             <field model="res.country.state" name="state_id" search="[('code','ilike','il')]"/>
             <field name="street">23 Rockwell Lane</field>
@@ -206,7 +206,7 @@
             <field eval="[(6, 0, [ref('res_partner_category_4'), ref('res_partner_category_7')])]" name="category_id"/>
             <field name="is_company">1</field>
             <field name="city">Miami</field>
-            <field name="zip">FL 33169</field>
+            <field name="zip">33169</field>
             <field name="country_id" ref="base.us"/>
             <field model="res.country.state" name="state_id" search="[('code','=','FL')]"/>
             <field name="email">contact@jackson.com</field>
@@ -270,7 +270,7 @@
             <field eval="[(6, 0, [ref('res_partner_category_7'), ref('res_partner_category_9')])]" name="category_id"/>
             <field name="is_company">1</field>
             <field name="city">Detroit</field>
-            <field name="zip">MI 48212</field>
+            <field name="zip">48212</field>
             <field name="country_id" ref="base.us"/>
             <field model="res.country.state" name="state_id" search="[('code','ilike','mi')]"/>
             <field name="street">60, Rosewood Court</field>
@@ -327,7 +327,7 @@
             <field name="is_company">1</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
             <field name="city">Boston</field>
-            <field name="zip">MA 02203</field>
+            <field name="zip">02203</field>
             <field name="email">info@thinkbig.com</field>
             <field name="phone">+1 857 349 3049</field>
             <field name="country_id" ref="base.us"/>
@@ -343,7 +343,7 @@
             <field eval="1" name="supplier"/>
             <field name="is_company">1</field>
             <field name="city">Cupertino</field>
-            <field name="zip">CA 95014</field>
+            <field name="zip">95014</field>
             <field name="country_id" ref="base.us"/>
             <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
             <field name="street">10200 S. De Anza Blvd</field>
@@ -403,7 +403,7 @@
             <field name="street">3rd Floor, Room 3-C,</field>
             <field name="street2">Carretera Panamericana, Km 1, Urb. Delgado Chalbaud</field>
             <field name="city">Caracas</field>
-            <field name="zip">CP 1090</field>
+            <field name="zip">1090</field>
             <field name="email">info@vauxoo.com</field>
             <field name="phone">+58 212 681 0538</field>
             <field name="country_id" ref="base.ve"/>
diff --git a/openerp/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py
index 7c2c4697ef0..3b576c84162 100644
--- a/openerp/addons/base/res/res_request.py
+++ b/openerp/addons/base/res/res_request.py
@@ -73,7 +73,7 @@ class res_request(osv.osv):
         'ref_partner_id':fields.many2one('res.partner', 'Partner Ref.', states={'closed':[('readonly',True)]}),
         'ref_doc1':fields.reference('Document Ref 1', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
         'ref_doc2':fields.reference('Document Ref 2', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
-        'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'State', required=True, readonly=True),
+        'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'Status', required=True, readonly=True),
         'history': fields.one2many('res.request.history','req_id', 'History')
     }
     _defaults = {