Merged with latest.

bzr revid: tta@openerp.com-20120817104610-h7pova57capzm1by

59 files changed, 440 insertions, 277 deletions

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 35505ea853f..cf69933c84a 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -33,13 +33,19 @@ Shows you a list of applications features to install from.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
-    'demo_xml': [],
+    'depends': ['base', 'web_kanban'],
+    'data': [
+        'security/ir.model.access.csv',
+        'base_setup_views.xml',
+        'res_config_view.xml',
+        'res_partner_view.xml',
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
+    'js': ['static/src/js/base_setup.js'],
+    'css': ['static/src/css/base_setup.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 9c1d7d9fa8e..e8e24969f2a 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -50,7 +50,7 @@ class specify_partner_terminology(osv.osv_memory):
     def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
         trans_obj = self.pool.get('ir.translation')
         user_obj = self.pool.get('res.users')
-        context_lang = user_obj.browse(cr, uid, uid, context=context).context_lang
+        context_lang = user_obj.browse(cr, uid, uid, context=context).lang
         existing_trans_ids = trans_obj.search(cr, uid, [('name','=',name), ('lang','=',context_lang), ('type','=',type), ('src','=',src), ('res_id','=',res_id)])
         if existing_trans_ids:
             trans_obj.write(cr, uid, existing_trans_ids, {'value': value}, context=context)
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 8be9aa0e2e3..e07f576aa41 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,47 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
+    <data>
 
-    <!-- Show menus that are hidden in module base -->
-    <record id="base.menu_res_company_global" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_users" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
+        <!-- Show menus that are hidden in module base -->
+        <record id="base.menu_res_company_global" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
+        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
 
-      <!--   Specify Your Terminology Config Wiz-->
-     <record id="base_setup_terminology_form" model="ir.ui.view">
-          <field name="name">Specify Your Terminology</field>
-          <field name="model">base.setup.terminology</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-         <field name="arch" type="xml">
-            <data>
-              <form position="attributes" version="7.0">
-                <attribute name="string">Specify Your Terminology</attribute>
-              </form>
-             <group string="res_config_contents" position="replace">
-                 <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
-                    <separator string="Specify Your Terminology"/>
-                    <group colspan="4">
-                        <field colspan="4" name="partner"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Use another word to say "Customer"</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">base.setup.terminology</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="base_setup_terminology_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
+        <!-- Specify your terminology config wiz -->
+        <record id="base_setup_terminology_form" model="ir.ui.view">
+            <field name="name">Specify Your Terminology</field>
+            <field name="model">base.setup.terminology</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes" version="7.0">
+                        <attribute name="string">Specify Your Terminology</attribute>
+                    </form>
+                    <group string="res_config_contents" position="replace">
+                        <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
+                        <separator string="Specify Your Terminology"/>
+                        <group colspan="4">
+                            <field colspan="4" name="partner"/>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
+        <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+            <field name="name">Use another word to say "Customer"</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.setup.terminology</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="base_setup_terminology_form"/>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-  </data>
+    </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index 24610329ce7..ac0092f0c19 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index 10a0d361a0b..cafc439e064 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 06ade5631c9..ce15b961192 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index c699c15307b..196bf12f7b8 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index d86bfb8e336..267876129f3 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 7d7d718883c..75cd997cc55 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index d163304e6c1..6cc1605fdd6 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index c81460f9f1c..8489b0ae0fc 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po
index 1d59779ccca..d528ed9cb39 100644
--- a/addons/base_setup/i18n/en_GB.po
+++ b/addons/base_setup/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -153,7 +153,7 @@ msgstr "Interface"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
 msgid "migrade.application.installer.modules"
-msgstr ""
+msgstr "migrade.application.installer.modules"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -186,6 +186,9 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Sets default language for the all user interface, when UI translations are "
+"available. If you want to Add new Language, you can add it from 'Load an "
+"Official Translation' wizard  from 'Administration' menu."
 
 #. module: base_setup
 #: view:user.preferences.config:0
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index f237e3c2093..e1ba63677a8 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 0a4d74dcbb3..0b2debd9438 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 9785936371a..231559c6416 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CR.po b/addons/base_setup/i18n/es_CR.po
index 1a302e7f264..297a94dd176 100644
--- a/addons/base_setup/i18n/es_CR.po
+++ b/addons/base_setup/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: \n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index bec7871677d..793c92c640b 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 3f2980f9a22..e5a19bb8957 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 7298e9a0cd3..ad96c2fcb4d 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 427ede1ed73..627b8440c4e 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 8d873238e2d..f20b149b9fa 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 845ea84b490..26bf9f8f08d 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index c8d1f101b04..935cb8b98f8 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
index 8c664ad7a6a..bb9030ae9b2 100644
--- a/addons/base_setup/i18n/gu.po
+++ b/addons/base_setup/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 6dd9562b887..c30a09dfcd1 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: hr\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index ad567adc5e1..bd6f54d7640 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Vendég"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
@@ -35,12 +35,12 @@ msgstr ""
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Létrehozás"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Tag"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Importálás"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -80,7 +80,7 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Vásárlók"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
@@ -164,7 +164,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Nyelv"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -205,7 +205,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Időzóna"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -239,7 +239,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Új felhasználók létrehozása"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
@@ -259,7 +259,7 @@ msgstr ""
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Egyszerűsített"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 9ac7f07a1ca..4fb5bbfdb93 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 95ebcdb9ec4..7cd8d1c9631 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index c879a913093..8d98742ac03 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-12 01:34+0000\n"
+"PO-Revision-Date: 2012-07-28 21:52+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr "ヒントを表示する。"
+msgstr "ヒントの表示"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -45,7 +45,7 @@ msgstr "メンバー"
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr "Googleの連絡先を同期する。"
+msgstr "Googleコンタクトの同期"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -57,7 +57,7 @@ msgstr "新規ユーザのタイムゾーンのデフォルト設定のために
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr "取り込む"
+msgstr "インポート"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -67,7 +67,7 @@ msgstr "提供者"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr "会社のヘッダーとフッターを設定します。"
+msgstr "会社ヘッダーとフッターの設定"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -76,8 +76,8 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
-"レポートに印刷されますので、会社のデータ（アドレス、ロゴ、銀行口座）を記入してください。　PDF "
-"ドキュメントのヘッダー/フッターを確認するには、\"ヘッダープレビュー\"をクリックします。"
+"レポートに印刷される会社のデータ（アドレス、ロゴ、銀行口座）を記入して下さい。PDF "
+"ドキュメントのヘッダー/フッターを確認するには、ヘッダープレビューをクリックします。"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -102,7 +102,7 @@ msgid ""
 "Data\" wizard"
 msgstr ""
 "このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
-"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナーをインポートすることができます。"
+"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナをインポートすることができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,7 +112,7 @@ msgstr "ユーザのプリファレンスを定義します。"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr "ユーザのプリファレンスを初期値に定義します。"
+msgstr "デフォルトのユーザプリファレンスの設定"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
@@ -131,8 +131,7 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
-"初めてopenERPを利用する場合は、簡素化されたインターフェイスを選択されることをお勧めします。設定後いつでもユーザープリファレンスから設定変更ができま"
-"す。"
+"初めてopenERPを利用する場合は、簡素化されたインタフェースを選択されることをお勧めします。設定後いつでもユーザプリファレンスから切り替えができます。"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -143,7 +142,7 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr "インターフェース"
+msgstr "インタフェース"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
@@ -160,7 +159,7 @@ msgstr "アプリケーション全体の顧客の用語を変更するには、
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr "占有者"
+msgstr "テナント"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -179,8 +178,8 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
-"UI翻訳が利用可能な時は、既定の言語を全てのユーザインターフェースに設定します。新しい言語を追加する場合は、\"管理\" "
-"メニューのウィザード\"オフィシャル翻訳をロードする' から追加することができます。"
+"UI翻訳が利用可能な時は、既定の言語を全てのユーザインタフェースに設定します。新しい言語を追加する場合は、\"管理\" "
+"メニューのウィザード\"オフィシャル翻訳のロード\"から追加することができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -189,8 +188,7 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
-"これは新規ユーザーのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザーはユーザー設定フォームで自由に設定変更ができま"
-"す。"
+"これは新規ユーザのデフォルトのプリファレンスを設定し、既存のすべてのものを更新します。　その後に、ユーザはユーザ設定フォームで自由に設定変更ができます。"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -274,7 +272,7 @@ msgstr "簡易化"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr "SugarCRMを取り込むために"
+msgstr "SugarCRMのインポートのため"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -284,9 +282,9 @@ msgstr "パートナ"
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr "用語を指定します。"
+msgstr "用語の定義"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr "Googleの連絡先を同期するために"
+msgstr "Googleコンタクトとの同期のため"
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index c70d49f916c..7b38058fb4c 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index c1629b1c4db..88a52e2b856 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index bda729abc0d..9b462559203 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 9766dac20f6..322ca6fc021 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -14,38 +14,38 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr ""
+msgstr "Зөвлөмжийг Харуулах"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Зочин"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
 msgid "product.installer"
-msgstr ""
+msgstr "product.installer"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Үүсгэх"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Гишүүн"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Google хаягуудыг ижилтгэх"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -53,21 +53,23 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Хэрэглэгчийн цагийн бүсийн ахны утгыг тохируулна уу, энэ нь сервер болон "
+"клиентийн цагийн бүсийн зөрүүг хөрвүүлэхэд хэрэглэгддэг."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Импортлох"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Ивээн тэтгэгч"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr ""
+msgstr "Компаний Толгой болон Хөлийг Тохируулна уу"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -76,21 +78,24 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Компаний өгөгдөл (хаяг, лого, банкны данс)-г бөглөснөөр эдгээр нь тайлангууд "
+"дээр хэвлэгддэг. PDF баримтууд дээрх хөл, толгойг шалгахын тулд 'Толгойг "
+"Урьдчилж Харах' даруулыг дарж шалгаж болно."
 
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Захиалагчид"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Өргөтгөсөн"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Өвчтөн"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -99,21 +104,24 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Энэ маягтаас захиалагчид болон тэдгээрийн холбогдох хаягуудыг гараараа "
+"оруулж болно эсвэл байгаа хаягуудыг CSV хүснэгтэн файлаар \"Өгөгдөл "
+"Импортлох\" харилцах цонхоор оруулдаг."
 
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Хэрэглэгчийн Тохиргоог Тодорхойлно уу"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr ""
+msgstr "Хэрэглэгчийн тохиргооны анхны утгуудыг тодорхойлно уу"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Saleforce-г импортлох"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
@@ -127,6 +135,10 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Хэрэв та OpenERP-г анх удаа хэрэглэж байгаа бол хялбаршуулсан харагдацыг "
+"сонгохыг онцгойлон зөвлөе. Энэ горимд бага боломжууд харагдах боловч "
+"хэрэглэхэд илүү хялбар. Дараа нь хэдийд ч хамаагүй өргөтгөсөн хувилбар руу "
+"шилжих боломжтой."
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -137,12 +149,12 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Интерфейс"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
 msgid "migrade.application.installer.modules"
-msgstr ""
+msgstr "migrade.application.installer.modules"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -150,21 +162,23 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Энэ харилцах цонхыг ашиглан захиалагчидад бүхэлд нь хэрэглэгдэх нэр "
+"томьёонуудыг сольж болно."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Эзэмшигч"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Захиалагч"
 
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Хэл"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -173,6 +187,9 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Хэрэглэгчийн интерфейсийн орчуулга бэлэн байвал хэрэглэгчийн хэлний анхны "
+"утгыг тааруулна. Хэрэв шинэ хэл нэмэхээр бол 'Удирдлага' менюгээс 'Албан "
+"ёсны орчуулга ачаалах' харилцах цонхоор хийх боломжтой."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -181,11 +198,14 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Энэ нь шинэ хэрэглэгчийн тохиргооны анхны утгуудыг тохируулахаас гадна "
+"байгаа хэрэглэгчдийн тохиргоог бүгдийг өөрчилдөг. Дараа нь хэрэглэгчид "
+"өөрсдөө тохиргоогоо чөлөөтэй өөрчлөх боломжтой."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Захиалагчийг та юу гэж дууддаг вэ?"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
@@ -195,33 +215,35 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Клиент"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Saleforce-г импортлох"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Цагийн бүс"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "\"Захиалагч\"-г хэлэх өөр үг сонго"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: help:user.preferences.config,menu_tips:0
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Хэрэв та байнга цэсний заавар, тайлбарыг дэлгэцэнд харахыг хүсвэл үүнийг "
+"сонго"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -234,52 +256,52 @@ msgstr "Зураг"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_user_preferences_config
 msgid "user.preferences.config"
-msgstr ""
+msgstr "user.preferences.config"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Нэмэлт Хэрэглэгчдийг Үүсгэх"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "Захиалагчдийг Үүсгэх буюу Импортлох"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "Sugarcrm-г импортлох"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Захиалагчдийг импортлох буюу үүсгэх"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Хялбарчилсан"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "Sugarcrm импортлох"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Өөрийн нэр томъёог зааж өгөх"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "Google хаягуудыг ижилтгэх"
 
 #~ msgid "State"
 #~ msgstr "Төлөв"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index eaa4eccc255..f48f270313d 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr ""
+msgstr "Visningstips"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Gjest"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
@@ -40,12 +40,12 @@ msgstr "Opprett"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Medlem"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Synk Google kontakt"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -62,12 +62,12 @@ msgstr "Importér"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Bidragsyter"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr ""
+msgstr "Sett firma topp-og bunntekst"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -103,17 +103,17 @@ msgstr ""
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Definer brukers preferanser"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr ""
+msgstr "Definer standard brukerreferanser"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "For import Saleforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
@@ -185,7 +185,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Hvordan ringer du en kunde"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
@@ -200,7 +200,7 @@ msgstr "Klient"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Import Saleforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -210,7 +210,7 @@ msgstr "Tidssone"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Bruk et annet for \"kunde\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -249,27 +249,27 @@ msgstr "Opprett eller importer kunder"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "Import Sugar CRM"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Importer eller opprett kunder"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Forenklet"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "For import Sugar CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index f31c945a9a4..24b5869c2c4 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index c030f04ce0c..d60b2de9dba 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 8f0879efa91..289f3050e1b 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index 8d99906710a..d9207075140 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 43313b581e8..15e42257467 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-26 22:45+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:07+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,6 +52,8 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Defina o padrão para a timezone de novos usuários, usado para fazer "
+"conversões de timezones entre servidor e cliente."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -61,7 +63,7 @@ msgstr "Importar"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Doador"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
@@ -75,6 +77,9 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Preencha os dados da empresa (Endereço, logo, contas bancárias) para que "
+"seja exibido em seus relatórios. Você pode clicar no botão \"Visualizar "
+"Cabeçalho\" para verificar o cabeçalho/rodapé dos documentos PDF"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -98,6 +103,9 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Crie ou importe clientes e seus contatos manualmente a partir deste "
+"formulário, ou você pode importar seus parceiros existentes por planilhas "
+"CSV através do assistente \"Importar Dados\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,12 +120,12 @@ msgstr "Define as Preferências Padrão dos Usuários"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Importar do Saleforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Para Quickbooks Ippids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -152,11 +160,13 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Você pode usar este assistente para mudar as terminologias para clientes em "
+"toda a aplicação"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Locatário"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -175,6 +185,10 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Defina o idioma padrão para toda a interface de usuário, quando traduções de "
+"UI estiverem disponíveis. Se você quiser adicionar um novo idioma, você pode "
+"adicionar pelo assistente \"Carregar uma tradução oficial\" do menu de "
+"administrador"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -183,16 +197,19 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Isto irá definir as preferências padrões para novos usuários e atualizar "
+"todos os existentes. Após isso, os usuários são livres para alterarem esses "
+"valores para suas próprias preferencias"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Como você chama um Cliente"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks Ippids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -202,7 +219,7 @@ msgstr "Cliente"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Importar Saleforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -212,7 +229,7 @@ msgstr "Fuso Horário"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Use uma outra palavra para dizer \"Cliente\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index c2b4fdfea5b..e007344d486 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 12e9145c576..8c51fa9c32e 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 7d555e0310b..9d07ac17669 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 21d5af09135..3e3dc2bba5f 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 6381ef45210..c9adc0439e5 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 4b44dad1c16..af88f5399eb 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 5dc33d5bf0b..4ee0f42ddef 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index b9c774279b2..1afa9579801 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -68,7 +68,7 @@ msgstr "Välgörare"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr "Sätt bolagets huvud- och fottext"
+msgstr "Sätt bolagets huvud-, fottext och valuta (SEK)"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 989260ad4b0..87a223c5ef3 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 783f5b048ba..ebf0897b7d9 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index f2cd56ac538..5a689c8ac10 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 1e6eac2097a..9dec941e294 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 57fa0dd62fc..1834e2f8697 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 0d7413cebbc..6f82e95cd6a 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index b2acbcb76ad..44f5393a043 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:51+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 6a73eb786ea..059a674e5f1 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,12 +25,12 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('Multi Company',
+        'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Activate Customer Portal',
+        'module_portal': fields.boolean('activate customer portal',
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
-        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+        'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
 
@@ -53,15 +53,17 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
+        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+            help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..fe0fc7d1254 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -1,36 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
         <record id="view_general_configuration" model="ir.ui.view">
             <field name="name">General Settings</field>
             <field name="model">base.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" version="7.0">
+                <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="General Settings"/>
+                    <div>
+                        <label string="You will also find several configuration options on your company data:
+                            address for the header and footer, overdue payments texts, etc."/>
+                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                    </div>
                     <group>
-                        <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group>
+                        <label for="id" string="Options"/>
+                        <div>
+                            <div name="multi_company">
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Share Data"/>
+                        <div>
                             <div>
-                                You will also find several configuration options on your company data:
-                                address for the header and footer, overdue payments texts, etc.
+                                <field name="module_share" class="oe_inline"/>
+                                <label for="module_share"/>
                             </div>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            <separator string="Others" colspan="2"/>
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
-                        </group>
-                        
+                            <div>
+                                <field name="module_portal" class="oe_inline"/>
+                                <label for="module_portal"/>
+                            </div>
+                            <div>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure outgoing email servers" class="oe_link"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
@@ -49,24 +62,61 @@
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Sales" version="7.0">
+                <form string="Configure Sales" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group>
-                            <group name="config_sale">
-                                <field name="module_crm" invisible="1"/>
-                                <separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                            </group>
-                            <group name="config_other">
-                            </group>
+                    <div name="linkedin">
+                        <separator string="Social Network Integration"/>
+                        <group name="LinkedIn">
+                            <label for="id" string="Contacts"/>
+                            <div name="LinkedIn">
+                                <div name="module_web_linkedin" class="oe_inline">
+                                    <field name="module_web_linkedin"/>
+                                    <label for="module_web_linkedin"/>
+                                </div>
+                            </div>
+                        </group>
+                    </div>
+                    <div name="customer feature">
+                        <separator string="Quotations and Sales Orders"/>
+                        <group name="Customer">
+                            <label for="id" string="Customer Features"/>
+                            <div name="Customer Features"/>
+                        </group>
+                        <group name="Sale">
+                            <label for="id" string="Sale Features"/>
+                            <div name="Sale Features"/>
+                        </group>
+                    </div>
+                    <div name="config_sale">
+                        <field name="module_crm" invisible="1"/>
+                        <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <p attrs="{'invisible': [('module_crm','=',False)]}">
+                            OpenERP allows to automatically create leads (or others documents)
+                            from incoming emails. You can automatically synchronize emails with OpenERP
+                            using regular POP/IMAP accounts, using a direct email integration script for your
+                            email server, or by manually pushing emails to OpenERP using specific
+                            plugins for your preferred email application.
+                        </p>
+                        <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <label for="id" string="On Mail Client"/>
+                            <div>
+                                <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline">
+                                    <field name="module_plugin_thunderbird"/>
+                                    <label for="module_plugin_thunderbird"/>
+                                </div>
+                                <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}">
+                                    <field name="module_plugin_outlook" class="oe_inline"/>
+                                    <label for="module_plugin_outlook"/>
+                                </div>
+                            </div>
                         </group>
+                    </div>
+                    <div name="config_other"/>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
new file mode 100644
index 00000000000..5aa24b3474d
--- /dev/null
+++ b/addons/base_setup/res_partner_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Add partner categories in partner kanban view -->
+        <record id="res_partner_kanban_view" model="ir.ui.view">
+            <field name="name">res.partner.kanban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
+                    <t t-foreach="record.category_id.raw_value" t-as="category">
+                        <span class="oe_tag" t-att-data-category_id="category"/>
+                    </t>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/base_setup/static/src/css/base_setup.css b/addons/base_setup/static/src/css/base_setup.css
new file mode 100644
index 00000000000..4e4b8a3c00a
--- /dev/null
+++ b/addons/base_setup/static/src/css/base_setup.css
@@ -0,0 +1,24 @@
+/* Remove bold from labels in config wizards */
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label {
+    font-weight: normal;
+}
+
+/* Separate .eo_link elements from the rest of the label's text */
+.oe_form_configuration .oe_form_group td:last-child .oe_link,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text {
+    position: relative;
+    left: 2em;
+}
+.oe_form_configuration .oe_form_group td:last-child .oe_link:before,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text:before {
+    content:"—";
+    padding-right: 1em;
+    color: grey;
+
+    /* Prevent the pseudo element's content to behave like its parent element */
+    position: absolute;
+    right: 100%;
+    bottom: 0; /* Parent element's height can vary */
+    pointer-events: none;
+}
diff --git a/addons/base_setup/static/src/js/base_setup.js b/addons/base_setup/static/src/js/base_setup.js
new file mode 100644
index 00000000000..4f900a3d69b
--- /dev/null
+++ b/addons/base_setup/static/src/js/base_setup.js
@@ -0,0 +1,24 @@
+openerp.base_setup = function(openerp) {
+    /* extend kanban to include the names of partner categories in the kanban view of partners */
+    openerp.web_kanban.KanbanView.include({
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(this, arguments);
+            if (this.dataset.model === 'res.partner') {
+                /* Set names for partner categories */
+                var category_ids = [];
+                this.$element.find('.oe_kanban_partner_categories span').each(function() {
+                    category_ids.push($(this).data('category_id'));
+                });
+                var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
+                dataset.name_get(_.uniq(category_ids)).then(function(result) {
+                    _.each(result, function(value) {
+                        self.$element
+                            .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
+                            .html(value[1]);
+                    });
+                });
+            }
+        }
+    });
+};