diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 3b5a1b9ba9..bee7e8a53a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -6,10 +6,6 @@ msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr "Не може да създавате взаимно вложени фирми!"
 
-msgctxt "error:res.user:"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr "Не може да изберете фирма която не е подчинена на основната фирма!"
-
 msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr "Деца"
@@ -206,10 +202,6 @@ msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "model:company.company.config.init,name:"
-msgid "Company Config Init"
-msgstr "Начално инициализиране на фирма"
-
 msgctxt "model:company.company.config.start,name:"
 msgid "Company Config"
 msgstr ""
@@ -286,14 +278,6 @@ msgctxt "odt:party.letter:"
 msgid "VAT Number:"
 msgstr "ДДС номер:"
 
-msgctxt "view:company.company.config.init:"
-msgid "Create Company"
-msgstr "Създаване на фирма"
-
-msgctxt "view:company.company.config.init:"
-msgid "You can now add your company into the system."
-msgstr "Сега може да добавите фирмата си към системата"
-
 msgctxt "view:company.company.config.start:"
 msgid "Create Company"
 msgstr "Създаване на фирма"
@@ -334,14 +318,6 @@ msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr "Отказ"
 
-msgctxt "wizard_button:company.company.config,init,company:"
-msgid "Ok"
-msgstr "Добре"
-
-msgctxt "wizard_button:company.company.config,init,end:"
-msgid "Cancel"
-msgstr "Отказ"
-
 msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr "Добре"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 6a1a5452cb..495fc613ba 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -1,131 +1,232 @@
-#
-# Albert Cervera i Areny <albert@nan-tic.com>, 2011.
+# 
 msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Last-Translator: Albert Cervera i Areny <albert@nan-tic.com>\n"
-"PO-Revision-Date: 2011-10-22 12:28+0200\n"
-"Project-Id-Version: \n"
-"Language-Team: Catalan <>\n"
-"Language: ca\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"MIME-Version: 1.0\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:company.company:0"
+msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr "No pot crear empreses recursives"
 
-msgctxt "error:res.user:0"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr ""
-"No pot establir una empresa que no és filla de la seva empresa principal"
-
-msgctxt "field:company.company,childs:0"
+msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr "Fills"
 
-msgctxt "field:company.company,currency:0"
+msgctxt "field:company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.company,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:company.company,currency:"
 msgid "Currency"
 msgstr "Divisa"
 
-msgctxt "field:company.company,employees:0"
+msgctxt "field:company.company,employees:"
 msgid "Employees"
 msgstr "Empleats"
 
-msgctxt "field:company.company,footer:0"
+msgctxt "field:company.company,footer:"
 msgid "Footer"
 msgstr "Peu de pàgina"
 
-msgctxt "field:company.company,header:0"
+msgctxt "field:company.company,header:"
 msgid "Header"
 msgstr "Encapçalat"
 
-msgctxt "field:company.company,parent:0"
+msgctxt "field:company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.company,parent:"
 msgid "Parent"
 msgstr "Pare"
 
-msgctxt "field:company.company,party:0"
+msgctxt "field:company.company,party:"
 msgid "Party"
 msgstr "Tercer"
 
-msgctxt "field:company.company,rec_name:0"
+msgctxt "field:company.company,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:company.employee,company:0"
+msgctxt "field:company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:company.company.config.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:company.employee,party:0"
+msgctxt "field:company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,party:"
 msgid "Party"
 msgstr "Tercer"
 
-msgctxt "field:company.employee,rec_name:0"
+msgctxt "field:company.employee,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:ir.cron,companies:0"
+msgctxt "field:company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.cron,companies:"
 msgid "Companies"
 msgstr "Empreses"
 
-msgctxt "field:ir.cron-company.company,company:0"
+msgctxt "field:ir.cron-company.company,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:ir.cron-company.company,cron:0"
+msgctxt "field:ir.cron-company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ir.cron-company.company,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:ir.cron-company.company,cron:"
 msgid "Cron"
 msgstr "Programador de tasques"
 
-msgctxt "field:ir.cron-company.company,rec_name:0"
+msgctxt "field:ir.cron-company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:ir.property,company:0"
+msgctxt "field:ir.cron-company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.property,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:ir.sequence,company:0"
+msgctxt "field:ir.sequence,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:ir.sequence.strict,company:0"
+msgctxt "field:ir.sequence.strict,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:res.user,companies:0"
+msgctxt "field:res.user,companies:"
 msgid "Current Companies"
 msgstr "Empreses actuals"
 
-msgctxt "field:res.user,company:0"
+msgctxt "field:res.user,company:"
 msgid "Current Company"
 msgstr "Empresa actual"
 
-msgctxt "field:res.user,employee:0"
+msgctxt "field:res.user,employee:"
 msgid "Employee"
 msgstr "Empleat"
 
-msgctxt "field:res.user,main_company:0"
+#, fuzzy
+msgctxt "field:res.user,employees:"
+msgid "Employees"
+msgstr "Empleats"
+
+msgctxt "field:res.user,main_company:"
 msgid "Main Company"
 msgstr "Empresa principal"
 
-msgctxt "help:ir.cron,companies:0"
+msgctxt "field:res.user-company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:res.user-company.employee,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,user:"
+msgid "User"
+msgstr "Usuari"
+
+msgctxt "field:res.user-company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:ir.cron,companies:"
 msgid "Companies registered for this cron"
 msgstr "Empreses registrades en aquest programador de tasques"
 
-msgctxt "model:company.company,name:0"
+msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "model:company.company.config.init,name:0"
-msgid "Company Config Init"
-msgstr "Inicialització de la configuració de l'empresa"
+msgctxt "model:company.company.config.start,name:"
+msgid "Company Config"
+msgstr ""
 
-msgctxt "model:company.employee,name:0"
+msgctxt "model:company.employee,name:"
 msgid "Employee"
 msgstr "Empleat"
 
+msgctxt "model:ir.action,name:act_company_config"
+msgid "Configure Company"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.action,name:act_company_list"
+msgid "Companies"
+msgstr "Empreses"
+
 msgctxt "model:ir.action,name:act_company_tree"
 msgid "Companies"
 msgstr "Empreses"
@@ -138,10 +239,15 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr "Carta"
 
-msgctxt "model:ir.cron-company.company,name:0"
+msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr "ir.cron-company.company"
 
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_company_list"
+msgid "Companies"
+msgstr "Empreses"
+
 msgctxt "model:ir.ui.menu,name:menu_company_tree"
 msgid "Companies"
 msgstr "Empreses"
@@ -150,90 +256,100 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr "Empleats"
 
-msgctxt "odt:party.letter:0"
+msgctxt "model:res.user-company.employee,name:"
+msgid "User - Employee"
+msgstr ""
+
+msgctxt "odt:party.letter:"
 msgid "Best Regards,"
 msgstr "Atentament,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Date:"
 msgstr "Data:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Dear Madams and Sirs,"
 msgstr "Estimats senyors i senyores,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "E-Mail:"
 msgstr "Correu electrònic:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Phone:"
 msgstr "Telèfon:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Subject:"
 msgstr "Assumpte:"
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "odt:party.letter:"
+msgid "VAT Number:"
+msgstr ""
+
+msgctxt "view:company.company.config.start:"
 msgid "Create Company"
-msgstr "Crear empresa"
+msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "You can now add your company into the system."
-msgstr "Ara pot afegir la seva empresa al sistema."
+msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
+msgid "Addresses"
+msgstr "Adreces"
+
+msgctxt "view:company.company:"
 msgid "Companies"
 msgstr "Empreses"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Employees"
 msgstr "Empleats"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
+msgid "General"
+msgstr "General"
+
+msgctxt "view:company.company:"
 msgid "Reports"
 msgstr "Informes"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.employee:"
 msgid "Addresses"
 msgstr "Adreces"
 
-msgctxt "view:company.company:0"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employee"
 msgstr "Empleat"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employees"
 msgstr "Empleats"
 
-msgctxt "view:company.employee:0"
-msgid "Addresses"
-msgstr "Adreces"
-
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "General"
 msgstr "General"
 
-msgctxt "wizard_button:company.company.config,company,add:0"
+msgctxt "wizard_button:company.company.config,company,add:"
 msgid "Add"
 msgstr "Afegir"
 
-msgctxt "wizard_button:company.company.config,company,end:0"
+msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-msgctxt "wizard_button:company.company.config,init,company:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr "Acceptar"
 
-msgctxt "wizard_button:company.company.config,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,end:"
 msgid "Cancel"
 msgstr "Cancel·lar"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 08a4102f76..c31d3f33d3 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,118 +2,218 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:company.company:0"
+msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr ""
 
-msgctxt "error:res.user:0"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr ""
-
-msgctxt "field:company.company,childs:0"
+msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr ""
 
-msgctxt "field:company.company,currency:0"
+msgctxt "field:company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.company,currency:"
 msgid "Currency"
 msgstr ""
 
-msgctxt "field:company.company,employees:0"
+msgctxt "field:company.company,employees:"
 msgid "Employees"
 msgstr ""
 
-msgctxt "field:company.company,footer:0"
+msgctxt "field:company.company,footer:"
 msgid "Footer"
 msgstr ""
 
-msgctxt "field:company.company,header:0"
+msgctxt "field:company.company,header:"
 msgid "Header"
 msgstr ""
 
-msgctxt "field:company.company,parent:0"
+msgctxt "field:company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.company,parent:"
 msgid "Parent"
 msgstr ""
 
-msgctxt "field:company.company,party:0"
+msgctxt "field:company.company,party:"
 msgid "Party"
 msgstr ""
 
-msgctxt "field:company.company,rec_name:0"
+msgctxt "field:company.company,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:company.employee,company:0"
+msgctxt "field:company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:company.company.config.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:company.employee,party:0"
+msgctxt "field:company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,party:"
 msgid "Party"
 msgstr ""
 
-msgctxt "field:company.employee,rec_name:0"
+msgctxt "field:company.employee,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:ir.cron,companies:0"
+msgctxt "field:company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.cron,companies:"
 msgid "Companies"
 msgstr ""
 
-msgctxt "field:ir.cron-company.company,company:0"
+msgctxt "field:ir.cron-company.company,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:ir.cron-company.company,cron:0"
+msgctxt "field:ir.cron-company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,cron:"
 msgid "Cron"
 msgstr ""
 
-msgctxt "field:ir.cron-company.company,rec_name:0"
+msgctxt "field:ir.cron-company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:ir.property,company:0"
+msgctxt "field:ir.cron-company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.property,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:ir.sequence,company:0"
+msgctxt "field:ir.sequence,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:ir.sequence.strict,company:0"
+msgctxt "field:ir.sequence.strict,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:res.user,companies:0"
+msgctxt "field:res.user,companies:"
 msgid "Current Companies"
 msgstr ""
 
-msgctxt "field:res.user,company:0"
+msgctxt "field:res.user,company:"
 msgid "Current Company"
 msgstr ""
 
-msgctxt "field:res.user,employee:0"
+msgctxt "field:res.user,employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "field:res.user,main_company:0"
+msgctxt "field:res.user,employees:"
+msgid "Employees"
+msgstr ""
+
+msgctxt "field:res.user,main_company:"
 msgid "Main Company"
 msgstr ""
 
-msgctxt "help:ir.cron,companies:0"
+msgctxt "field:res.user-company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,employee:"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,user:"
+msgid "User"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:ir.cron,companies:"
 msgid "Companies registered for this cron"
 msgstr ""
 
-msgctxt "model:company.company,name:0"
+msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr ""
 
-msgctxt "model:company.company.config.init,name:0"
-msgid "Company Config Init"
+msgctxt "model:company.company.config.start,name:"
+msgid "Company Config"
 msgstr ""
 
-msgctxt "model:company.employee,name:0"
+msgctxt "model:company.employee,name:"
 msgid "Employee"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_company_config"
+msgid "Configure Company"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_company_list"
 msgid "Companies"
 msgstr ""
@@ -130,7 +230,7 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr ""
 
-msgctxt "model:ir.cron-company.company,name:0"
+msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr ""
 
@@ -146,78 +246,82 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "model:res.user-company.employee,name:"
+msgid "User - Employee"
+msgstr ""
+
+msgctxt "odt:party.letter:"
 msgid "Best Regards,"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Dear Madams and Sirs,"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "E-Mail:"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Phone:"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Subject:"
 msgstr ""
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "VAT Number:"
 msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "Create Company"
 msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "You can now add your company into the system."
 msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Companies"
 msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Employees"
 msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Reports"
 msgstr ""
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employees"
 msgstr ""
 
-msgctxt "wizard_button:company.company.config,company,add:0"
+msgctxt "wizard_button:company.company.config,company,add:"
 msgid "Add"
 msgstr ""
 
-msgctxt "wizard_button:company.company.config,company,end:0"
+msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr ""
 
-msgctxt "wizard_button:company.company.config,init,company:0"
+msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr ""
 
-msgctxt "wizard_button:company.company.config,init,end:0"
+msgctxt "wizard_button:company.company.config,start,end:"
 msgid "Cancel"
 msgstr ""
diff --git a/locale/es_AR.po b/locale/es_AR.po
index bfe49fd44a..542f2921b5 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,343 +1,3 @@
 # 
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:company.company:"
-msgid "You can not create recursive companies!"
-msgstr "¡No puede crear empresas recursivas!"
-
-msgctxt "field:company.company,childs:"
-msgid "Children"
-msgstr "Hijos"
-
-msgctxt "field:company.company,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:company.company,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:company.company,currency:"
-msgid "Currency"
-msgstr "Divisa"
-
-msgctxt "field:company.company,employees:"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "field:company.company,footer:"
-msgid "Footer"
-msgstr "Pie de página"
-
-msgctxt "field:company.company,header:"
-msgid "Header"
-msgstr "Encabezado"
-
-msgctxt "field:company.company,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.company,parent:"
-msgid "Parent"
-msgstr "Padre"
-
-msgctxt "field:company.company,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:company.company,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:company.company,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:company.company,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:company.company.config.start,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:company.employee,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:company.employee,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:company.employee,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:company.employee,party:"
-msgid "Party"
-msgstr "Entidad"
-
-msgctxt "field:company.employee,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:company.employee,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:company.employee,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:ir.cron,companies:"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "field:ir.cron-company.company,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:ir.cron-company.company,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:ir.cron-company.company,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:ir.cron-company.company,cron:"
-msgid "Cron"
-msgstr "Programador de tareas"
-
-msgctxt "field:ir.cron-company.company,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:ir.cron-company.company,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:ir.cron-company.company,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:ir.cron-company.company,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "field:ir.property,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:ir.sequence,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:ir.sequence.strict,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:res.user,companies:"
-msgid "Current Companies"
-msgstr "Empresas actuales"
-
-msgctxt "field:res.user,company:"
-msgid "Current Company"
-msgstr "Empresa actual"
-
-msgctxt "field:res.user,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:res.user,employees:"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "field:res.user,main_company:"
-msgid "Main Company"
-msgstr "Empresa principal"
-
-msgctxt "field:res.user-company.employee,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:res.user-company.employee,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:res.user-company.employee,employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "field:res.user-company.employee,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:res.user-company.employee,rec_name:"
-msgid "Name"
-msgstr "Nombre del campo"
-
-msgctxt "field:res.user-company.employee,user:"
-msgid "User"
-msgstr "Usuario"
-
-msgctxt "field:res.user-company.employee,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:res.user-company.employee,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
-msgctxt "help:ir.cron,companies:"
-msgid "Companies registered for this cron"
-msgstr "Empresas registradas en este programador de tareas"
-
-msgctxt "model:company.company,name:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "model:company.company.config.start,name:"
-msgid "Company Config"
-msgstr "Configuración de Empresa"
-
-msgctxt "model:company.employee,name:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "model:ir.action,name:act_company_config"
-msgid "Configure Company"
-msgstr "Configurar Empresa"
-
-msgctxt "model:ir.action,name:act_company_list"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "model:ir.action,name:act_company_tree"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "model:ir.action,name:act_employee_form"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "model:ir.action,name:report_letter"
-msgid "Letter"
-msgstr "Carta"
-
-msgctxt "model:ir.cron-company.company,name:"
-msgid "ir.cron-company.company"
-msgstr "ir.cron-company.company"
-
-msgctxt "model:ir.ui.menu,name:menu_company_list"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "model:ir.ui.menu,name:menu_company_tree"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "model:ir.ui.menu,name:menu_employee_form"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "model:res.user-company.employee,name:"
-msgid "User - Employee"
-msgstr "Usuario - Empleado"
-
-msgctxt "odt:party.letter:"
-msgid "Best Regards,"
-msgstr "Atentamente,"
-
-msgctxt "odt:party.letter:"
-msgid "Date:"
-msgstr "Fecha:"
-
-msgctxt "odt:party.letter:"
-msgid "Dear Madams and Sirs,"
-msgstr "Estimados señores y señoras,"
-
-msgctxt "odt:party.letter:"
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-msgctxt "odt:party.letter:"
-msgid "Phone:"
-msgstr "Teléfono:"
-
-msgctxt "odt:party.letter:"
-msgid "Subject:"
-msgstr "Asunto:"
-
-msgctxt "odt:party.letter:"
-msgid "VAT Number:"
-msgstr "CUIT:"
-
-msgctxt "view:company.company.config.start:"
-msgid "Create Company"
-msgstr "Crear una Empresa"
-
-msgctxt "view:company.company.config.start:"
-msgid "You can now add your company into the system."
-msgstr "Ahora puede añadir su empresa al sistema."
-
-msgctxt "view:company.company:"
-msgid "Addresses"
-msgstr "Direcciones"
-
-msgctxt "view:company.company:"
-msgid "Companies"
-msgstr "Empresas"
-
-msgctxt "view:company.company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "view:company.company:"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "view:company.company:"
-msgid "General"
-msgstr "General"
-
-msgctxt "view:company.company:"
-msgid "Reports"
-msgstr "Informes"
-
-msgctxt "view:company.employee:"
-msgid "Addresses"
-msgstr "Direcciones"
-
-msgctxt "view:company.employee:"
-msgid "Employee"
-msgstr "Empleado"
-
-msgctxt "view:company.employee:"
-msgid "Employees"
-msgstr "Empleados"
-
-msgctxt "view:company.employee:"
-msgid "General"
-msgstr "General"
-
-msgctxt "wizard_button:company.company.config,company,add:"
-msgid "Add"
-msgstr "Añadir"
-
-msgctxt "wizard_button:company.company.config,company,end:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "wizard_button:company.company.config,start,company:"
-msgid "Ok"
-msgstr "Aceptar"
-
-msgctxt "wizard_button:company.company.config,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 32e56e1d2c..e688aa8f6b 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,119 +2,226 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:company.company:0"
+msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr "No puede crear compañías recursivas!"
 
-msgctxt "error:res.user:0"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr ""
-"No puede establecer una compañía que no es hija de su compañía principal!"
-
-msgctxt "field:company.company,childs:0"
+msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr "Hij@s"
 
-msgctxt "field:company.company,currency:0"
+msgctxt "field:company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.company,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:company.company,currency:"
 msgid "Currency"
 msgstr "Moneda"
 
-msgctxt "field:company.company,employees:0"
+msgctxt "field:company.company,employees:"
 msgid "Employees"
 msgstr "Empleados"
 
-msgctxt "field:company.company,footer:0"
+msgctxt "field:company.company,footer:"
 msgid "Footer"
 msgstr "Pie de página"
 
-msgctxt "field:company.company,header:0"
+msgctxt "field:company.company,header:"
 msgid "Header"
 msgstr "Encabezado"
 
-msgctxt "field:company.company,parent:0"
+msgctxt "field:company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.company,parent:"
 msgid "Parent"
 msgstr "Padre"
 
-msgctxt "field:company.company,party:0"
+msgctxt "field:company.company,party:"
 msgid "Party"
 msgstr "Tercero"
 
-msgctxt "field:company.company,rec_name:0"
+msgctxt "field:company.company,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-msgctxt "field:company.employee,company:0"
+msgctxt "field:company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:company.company.config.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:company.employee,party:0"
+msgctxt "field:company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:company.employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,party:"
 msgid "Party"
 msgstr "Tercero"
 
-msgctxt "field:company.employee,rec_name:0"
+msgctxt "field:company.employee,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-msgctxt "field:ir.cron,companies:0"
+msgctxt "field:company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.cron,companies:"
 msgid "Companies"
 msgstr "Compañías"
 
-msgctxt "field:ir.cron-company.company,company:0"
+msgctxt "field:ir.cron-company.company,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:ir.cron-company.company,cron:0"
+msgctxt "field:ir.cron-company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:ir.cron-company.company,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:ir.cron-company.company,cron:"
 msgid "Cron"
 msgstr "Agendador"
 
-msgctxt "field:ir.cron-company.company,rec_name:0"
+msgctxt "field:ir.cron-company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
-msgctxt "field:ir.property,company:0"
+msgctxt "field:ir.cron-company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.property,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:ir.sequence,company:0"
+msgctxt "field:ir.sequence,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:ir.sequence.strict,company:0"
+msgctxt "field:ir.sequence.strict,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:res.user,companies:0"
+msgctxt "field:res.user,companies:"
 msgid "Current Companies"
 msgstr "Compañías en Curso"
 
-msgctxt "field:res.user,company:0"
+msgctxt "field:res.user,company:"
 msgid "Current Company"
 msgstr "Compañía Actual"
 
-msgctxt "field:res.user,employee:0"
+msgctxt "field:res.user,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:res.user,main_company:0"
+#, fuzzy
+msgctxt "field:res.user,employees:"
+msgid "Employees"
+msgstr "Empleados"
+
+msgctxt "field:res.user,main_company:"
 msgid "Main Company"
 msgstr "Compañía Principal"
 
-msgctxt "help:ir.cron,companies:0"
+msgctxt "field:res.user-company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:res.user-company.employee,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,rec_name:"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,user:"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:res.user-company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:ir.cron,companies:"
 msgid "Companies registered for this cron"
 msgstr "Compañías registradas para este lanzador"
 
-msgctxt "model:company.company,name:0"
+msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "model:company.company.config.init,name:0"
-msgid "Company Config Init"
-msgstr "Configuración inicial de Compañía"
+msgctxt "model:company.company.config.start,name:"
+msgid "Company Config"
+msgstr ""
 
-msgctxt "model:company.employee,name:0"
+msgctxt "model:company.employee,name:"
 msgid "Employee"
 msgstr "Empleado"
 
+msgctxt "model:ir.action,name:act_company_config"
+msgid "Configure Company"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.action,name:act_company_list"
 msgid "Companies"
@@ -132,7 +239,7 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr "Carta"
 
-msgctxt "model:ir.cron-company.company,name:0"
+msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr "ir.cron-company.company"
 
@@ -149,94 +256,100 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr "Empleados"
 
-msgctxt "odt:party.letter:0"
+msgctxt "model:res.user-company.employee,name:"
+msgid "User - Employee"
+msgstr ""
+
+msgctxt "odt:party.letter:"
 msgid "Best Regards,"
 msgstr "Atentamente,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Dear Madams and Sirs,"
 msgstr "Estimados Señoras y Señores,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "E-Mail:"
 msgstr "Correo electrónico:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Phone:"
 msgstr "Teléfono:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Subject:"
 msgstr "Título:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "VAT Number:"
 msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "Create Company"
-msgstr "Crear Compañía"
+msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "You can now add your company into the system."
-msgstr "Ahora puede añadir su compañía al sistema."
+msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Addresses"
 msgstr "Direcciones"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Companies"
 msgstr "Compañías"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Employees"
 msgstr "Empleados"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "General"
 msgstr "General"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Reports"
 msgstr "Reportes"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Addresses"
 msgstr "Direcciones"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employees"
 msgstr "Empleados"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "General"
 msgstr "General"
 
-msgctxt "wizard_button:company.company.config,company,add:0"
+msgctxt "wizard_button:company.company.config,company,add:"
 msgid "Add"
 msgstr "Adicionar"
 
-msgctxt "wizard_button:company.company.config,company,end:0"
+msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "wizard_button:company.company.config,init,company:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr "Aceptar"
 
-msgctxt "wizard_button:company.company.config,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ceef2c6db6..7fc0410c39 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -234,26 +234,10 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr "Lettre"
 
-msgctxt "model:ir.cron,name:"
-msgid ""
-msgstr ""
-
 msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr ""
 
-msgctxt "model:ir.property,name:"
-msgid ""
-msgstr ""
-
-msgctxt "model:ir.sequence,name:"
-msgid ""
-msgstr ""
-
-msgctxt "model:ir.sequence.strict,name:"
-msgid ""
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_company_list"
 msgid "Companies"
 msgstr "Sociétés"
@@ -266,14 +250,6 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr "Employés"
 
-msgctxt "model:party.configuration,name:"
-msgid ""
-msgstr ""
-
-msgctxt "model:res.user,name:"
-msgid ""
-msgstr ""
-
 msgctxt "model:res.user-company.employee,name:"
 msgid "User - Employee"
 msgstr "Utilisateur - Employé"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 76d37a2736..2d548e8953 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,120 +2,222 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:company.company:0"
+msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr "U kunt geen bedrijven aanmaken die naar zichzelf verwijzen!"
 
-msgctxt "error:res.user:0"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr ""
-"U kunt geen bedrijf kiezen dat geen onderdeel uitmaakt van het "
-"moederbedrijf!"
-
-msgctxt "field:company.company,childs:0"
+msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr "Onderliggende niveaus"
 
-msgctxt "field:company.company,currency:0"
+msgctxt "field:company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.company,currency:"
 msgid "Currency"
 msgstr "Valuta"
 
-msgctxt "field:company.company,employees:0"
+msgctxt "field:company.company,employees:"
 msgid "Employees"
 msgstr "Werknemers"
 
-msgctxt "field:company.company,footer:0"
+msgctxt "field:company.company,footer:"
 msgid "Footer"
 msgstr "Werknemers"
 
-msgctxt "field:company.company,header:0"
+msgctxt "field:company.company,header:"
 msgid "Header"
 msgstr "Werknemers"
 
-msgctxt "field:company.company,parent:0"
+msgctxt "field:company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.company,parent:"
 msgid "Parent"
 msgstr "Bovenliggend niveau"
 
-msgctxt "field:company.company,party:0"
+msgctxt "field:company.company,party:"
 msgid "Party"
 msgstr "Relatie"
 
-msgctxt "field:company.company,rec_name:0"
+msgctxt "field:company.company,rec_name:"
 msgid "Name"
 msgstr "Naam"
 
-msgctxt "field:company.employee,company:0"
+msgctxt "field:company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:company.company.config.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:company.employee,party:0"
+msgctxt "field:company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,party:"
 msgid "Party"
 msgstr "Relatie"
 
-msgctxt "field:company.employee,rec_name:0"
+msgctxt "field:company.employee,rec_name:"
 msgid "Name"
 msgstr "Naam"
 
-msgctxt "field:ir.cron,companies:0"
+msgctxt "field:company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.cron,companies:"
 msgid "Companies"
 msgstr "Bedrijven"
 
-msgctxt "field:ir.cron-company.company,company:0"
+msgctxt "field:ir.cron-company.company,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:ir.cron-company.company,cron:0"
+msgctxt "field:ir.cron-company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,cron:"
 msgid "Cron"
 msgstr "Cyclische opdracht"
 
-msgctxt "field:ir.cron-company.company,rec_name:0"
+msgctxt "field:ir.cron-company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,rec_name:"
 msgid "Name"
 msgstr "Naam"
 
-msgctxt "field:ir.property,company:0"
+msgctxt "field:ir.cron-company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.property,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:ir.sequence,company:0"
+msgctxt "field:ir.sequence,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:ir.sequence.strict,company:0"
+msgctxt "field:ir.sequence.strict,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:res.user,companies:0"
+msgctxt "field:res.user,companies:"
 msgid "Current Companies"
 msgstr "Huidige bedrijven"
 
-msgctxt "field:res.user,company:0"
+msgctxt "field:res.user,company:"
 msgid "Current Company"
 msgstr "Huidig bedrijf"
 
-msgctxt "field:res.user,employee:0"
+msgctxt "field:res.user,employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
-msgctxt "field:res.user,main_company:0"
+#, fuzzy
+msgctxt "field:res.user,employees:"
+msgid "Employees"
+msgstr "Werknemers"
+
+msgctxt "field:res.user,main_company:"
 msgid "Main Company"
 msgstr "Moederbedrijf"
 
-msgctxt "help:ir.cron,companies:0"
+msgctxt "field:res.user-company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,employee:"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:res.user-company.employee,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,rec_name:"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,user:"
+msgid "User"
+msgstr "Gebruiker"
+
+msgctxt "field:res.user-company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:ir.cron,companies:"
 msgid "Companies registered for this cron"
 msgstr "Bedrijven aangesloten op deze cyclische opdracht"
 
-msgctxt "model:company.company,name:0"
+msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "model:company.company.config.init,name:0"
-msgid "Company Config Init"
-msgstr "Bedrijfsinstellingen gaan maken"
+msgctxt "model:company.company.config.start,name:"
+msgid "Company Config"
+msgstr ""
 
-msgctxt "model:company.employee,name:0"
+msgctxt "model:company.employee,name:"
 msgid "Employee"
 msgstr "Werknemer"
 
+msgctxt "model:ir.action,name:act_company_config"
+msgid "Configure Company"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.action,name:act_company_list"
 msgid "Companies"
@@ -133,7 +235,7 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr "Brief"
 
-msgctxt "model:ir.cron-company.company,name:0"
+msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr ""
 
@@ -150,78 +252,84 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr "Werknemers"
 
-msgctxt "odt:party.letter:0"
+msgctxt "model:res.user-company.employee,name:"
+msgid "User - Employee"
+msgstr ""
+
+msgctxt "odt:party.letter:"
 msgid "Best Regards,"
 msgstr "Met vriendelijke groet,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Dear Madams and Sirs,"
 msgstr "Geachte heer/mevrouw,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Phone:"
 msgstr "Telefoon:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Subject:"
 msgstr "Betreft:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "VAT Number:"
 msgstr "BTW-nummer:"
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "Create Company"
-msgstr "Bedrijf aanmaken"
+msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "You can now add your company into the system."
-msgstr "U kunt nu uw eigen bedrijf toevoegen aan het systeem."
+msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Companies"
 msgstr "Bedrijven"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Employees"
 msgstr "Werknemers"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Reports"
 msgstr "Rapportage"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employees"
 msgstr "Werknemers"
 
-msgctxt "wizard_button:company.company.config,company,add:0"
+msgctxt "wizard_button:company.company.config,company,add:"
 msgid "Add"
 msgstr "Toevoegen"
 
-msgctxt "wizard_button:company.company.config,company,end:0"
+msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr "Annuleren"
 
-msgctxt "wizard_button:company.company.config,init,company:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr "Oké"
 
-msgctxt "wizard_button:company.company.config,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,end:"
 msgid "Cancel"
 msgstr "Annuleren"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 9c21bd1967..78384138c2 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,120 +2,222 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:company.company:0"
+msgctxt "error:company.company:"
 msgid "You can not create recursive companies!"
 msgstr "Вы не можете создать взаимоподчинённые организации"
 
-msgctxt "error:res.user:0"
-msgid "You can not set a company that is not a child of your main company!"
-msgstr ""
-"вы не можете установить учетную организацию, отсутвуют подразделения вашей "
-"компании"
-
-msgctxt "field:company.company,childs:0"
+msgctxt "field:company.company,childs:"
 msgid "Children"
 msgstr "Подчиненый"
 
-msgctxt "field:company.company,currency:0"
+msgctxt "field:company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.company,currency:"
 msgid "Currency"
 msgstr "Валюта"
 
-msgctxt "field:company.company,employees:0"
+msgctxt "field:company.company,employees:"
 msgid "Employees"
 msgstr "Сотрудники"
 
-msgctxt "field:company.company,footer:0"
+msgctxt "field:company.company,footer:"
 msgid "Footer"
 msgstr "Нижний колонтитул"
 
-msgctxt "field:company.company,header:0"
+msgctxt "field:company.company,header:"
 msgid "Header"
 msgstr "Верхний колонтитул"
 
-msgctxt "field:company.company,parent:0"
+msgctxt "field:company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.company,parent:"
 msgid "Parent"
 msgstr "Основной"
 
-msgctxt "field:company.company,party:0"
+msgctxt "field:company.company,party:"
 msgid "Party"
 msgstr "Контрагент"
 
-msgctxt "field:company.company,rec_name:0"
+msgctxt "field:company.company,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:company.employee,company:0"
+msgctxt "field:company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:company.company.config.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:company.employee,party:0"
+msgctxt "field:company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:company.employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:company.employee,party:"
 msgid "Party"
 msgstr "Контрагент"
 
-msgctxt "field:company.employee,rec_name:0"
+msgctxt "field:company.employee,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:ir.cron,companies:0"
+msgctxt "field:company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.cron,companies:"
 msgid "Companies"
 msgstr "Организация"
 
-msgctxt "field:ir.cron-company.company,company:0"
+msgctxt "field:ir.cron-company.company,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:ir.cron-company.company,cron:0"
+msgctxt "field:ir.cron-company.company,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,cron:"
 msgid "Cron"
 msgstr "Планировщик"
 
-msgctxt "field:ir.cron-company.company,rec_name:0"
+msgctxt "field:ir.cron-company.company,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:ir.property,company:0"
+msgctxt "field:ir.cron-company.company,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:ir.cron-company.company,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:ir.property,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:ir.sequence,company:0"
+msgctxt "field:ir.sequence,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:ir.sequence.strict,company:0"
+msgctxt "field:ir.sequence.strict,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:res.user,companies:0"
+msgctxt "field:res.user,companies:"
 msgid "Current Companies"
 msgstr "Текущие организации"
 
-msgctxt "field:res.user,company:0"
+msgctxt "field:res.user,company:"
 msgid "Current Company"
 msgstr "Текущая организация"
 
-msgctxt "field:res.user,employee:0"
+msgctxt "field:res.user,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
-msgctxt "field:res.user,main_company:0"
+#, fuzzy
+msgctxt "field:res.user,employees:"
+msgid "Employees"
+msgstr "Сотрудники"
+
+msgctxt "field:res.user,main_company:"
 msgid "Main Company"
 msgstr "Основная организация"
 
-msgctxt "help:ir.cron,companies:0"
+msgctxt "field:res.user-company.employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,employee:"
+msgid "Employee"
+msgstr "Сотрудник"
+
+msgctxt "field:res.user-company.employee,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,rec_name:"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:res.user-company.employee,user:"
+msgid "User"
+msgstr "Пользователь"
+
+msgctxt "field:res.user-company.employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:res.user-company.employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "help:ir.cron,companies:"
 msgid "Companies registered for this cron"
 msgstr "Организации зарегистрированные для этого планировщика"
 
-msgctxt "model:company.company,name:0"
+msgctxt "model:company.company,name:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "model:company.company.config.init,name:0"
-msgid "Company Config Init"
-msgstr "Конфигурация модуля предприятия"
+msgctxt "model:company.company.config.start,name:"
+msgid "Company Config"
+msgstr ""
 
-msgctxt "model:company.employee,name:0"
+msgctxt "model:company.employee,name:"
 msgid "Employee"
 msgstr "Сотрудник"
 
+msgctxt "model:ir.action,name:act_company_config"
+msgid "Configure Company"
+msgstr ""
+
 #, fuzzy
 msgctxt "model:ir.action,name:act_company_list"
 msgid "Companies"
@@ -133,7 +235,7 @@ msgctxt "model:ir.action,name:report_letter"
 msgid "Letter"
 msgstr "Письмо"
 
-msgctxt "model:ir.cron-company.company,name:0"
+msgctxt "model:ir.cron-company.company,name:"
 msgid "ir.cron-company.company"
 msgstr "Планировщик"
 
@@ -150,83 +252,89 @@ msgctxt "model:ir.ui.menu,name:menu_employee_form"
 msgid "Employees"
 msgstr "Сотрудники"
 
-msgctxt "odt:party.letter:0"
+msgctxt "model:res.user-company.employee,name:"
+msgid "User - Employee"
+msgstr ""
+
+msgctxt "odt:party.letter:"
 msgid "Best Regards,"
 msgstr "С уважением,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Date:"
 msgstr "Дата:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Dear Madams and Sirs,"
 msgstr "Уважаемые дамы и годпода,"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Phone:"
 msgstr "Телефон:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "Subject:"
 msgstr "Тема:"
 
-msgctxt "odt:party.letter:0"
+msgctxt "odt:party.letter:"
 msgid "VAT Number:"
 msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "Create Company"
-msgstr "Создать организацию"
+msgstr ""
 
-msgctxt "view:company.company.config.init:0"
+msgctxt "view:company.company.config.start:"
 msgid "You can now add your company into the system."
-msgstr "Теперь вы можете добавить организацию в систему"
+msgstr ""
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Companies"
 msgstr "Организация"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Employees"
 msgstr "Сотрудники"
 
-msgctxt "view:company.company:0"
+msgctxt "view:company.company:"
 msgid "Reports"
 msgstr "Отчеты"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
 #, fuzzy
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employees"
 msgstr "Сотрудники"
 
-msgctxt "view:company.employee:0"
+msgctxt "view:company.employee:"
 msgid "Employess"
 msgstr "Сотрудники"
 
-msgctxt "wizard_button:company.company.config,company,add:0"
+msgctxt "wizard_button:company.company.config,company,add:"
 msgid "Add"
 msgstr "Добавить"
 
-msgctxt "wizard_button:company.company.config,company,end:0"
+msgctxt "wizard_button:company.company.config,company,end:"
 msgid "Cancel"
 msgstr "Отменить"
 
-msgctxt "wizard_button:company.company.config,init,company:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,company:"
 msgid "Ok"
 msgstr "Да"
 
-msgctxt "wizard_button:company.company.config,init,end:0"
+#, fuzzy
+msgctxt "wizard_button:company.company.config,start,end:"
 msgid "Cancel"
 msgstr "Отменить"