[MERGE] Merge with main addons

bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk

25 files changed, 148 insertions, 126 deletions

diff --git a/addons/users_ldap/i18n/ar.po b/addons/users_ldap/i18n/ar.po
index 0f44eb19e13..0d367c38b58 100644
--- a/addons/users_ldap/i18n/ar.po
+++ b/addons/users_ldap/i18n/ar.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -87,12 +87,12 @@ msgstr ""
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "معلومات المستخدم"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "اسم الشركة يجب أن يكون فريداً !"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -102,7 +102,7 @@ msgstr "الشركات"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "متغير العملية"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -112,7 +112,7 @@ msgstr ""
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "استخدم TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -122,12 +122,12 @@ msgstr "مسلسل"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "معلومات تسجيل الدخول"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "معلومات الخادم"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
diff --git a/addons/users_ldap/i18n/bg.po b/addons/users_ldap/i18n/bg.po
index be3fd6e2078..f8bcf999641 100644
--- a/addons/users_ldap/i18n/bg.po
+++ b/addons/users_ldap/i18n/bg.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/ca.po b/addons/users_ldap/i18n/ca.po
index 11c4c36f57e..7e2c2d4a2ea 100644
--- a/addons/users_ldap/i18n/ca.po
+++ b/addons/users_ldap/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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/da.po b/addons/users_ldap/i18n/da.po
index e9913368813..d62031437d3 100644
--- a/addons/users_ldap/i18n/da.po
+++ b/addons/users_ldap/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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/de.po b/addons/users_ldap/i18n/de.po
index 6f0762c44e0..768ee17ff6d 100644
--- a/addons/users_ldap/i18n/de.po
+++ b/addons/users_ldap/i18n/de.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -44,7 +44,7 @@ msgstr ""
 #: view:res.company:0
 #: view:res.company.ldap:0
 msgid "LDAP Configuration"
-msgstr "Konfiguration LDAP"
+msgstr "LDAP-Konfiguration"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_binddn:0
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index ab062370929..2fe59e20b6d 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_ldap/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-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/es_CR.po b/addons/users_ldap/i18n/es_CR.po
index a240ab24e9d..0b8a5872240 100644
--- a/addons/users_ldap/i18n/es_CR.po
+++ b/addons/users_ldap/i18n/es_CR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-20 01:19+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish <es@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-02-21 05:56+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "Language: es\n"
 
 #. module: users_ldap
diff --git a/addons/users_ldap/i18n/fi.po b/addons/users_ldap/i18n/fi.po
index 86d22108c20..6cd9f872b0e 100644
--- a/addons/users_ldap/i18n/fi.po
+++ b/addons/users_ldap/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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -77,6 +77,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"Käyttäjätunnus, jota käytetään LDAP hakemistokyselyihin. Jätä tyhjäksi niin "
+"otetaan yhteyttä anonyymisti."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -86,12 +88,12 @@ msgstr ""
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Käyttäjän tiedot"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Yrityksen nimen pitää olla uniikki!"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -101,7 +103,7 @@ msgstr "Yritykset"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Prosessin parametri"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -111,7 +113,7 @@ msgstr ""
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Käytä TLSää"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -121,17 +123,17 @@ msgstr "Sekvenssi"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Kirjautumistiedot"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Palvelimen tiedot"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Määrittele LDAP palvelin"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
@@ -149,6 +151,7 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"Salasana LDAP käyttäjätunnukselle jota käytetään hakuihin LDAP hakemistosta."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
diff --git a/addons/users_ldap/i18n/fr.po b/addons/users_ldap/i18n/fr.po
index 69b0af05048..2e9ed231fb6 100644
--- a/addons/users_ldap/i18n/fr.po
+++ b/addons/users_ldap/i18n/fr.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -36,6 +36,9 @@ msgid ""
 "option requires a server with STARTTLS enabled, otherwise all authentication "
 "attempts will fail."
 msgstr ""
+"Demander un cryptage sécurisé TLS/SSL  lors de la connexion au serveur LDAP. "
+"Cette option nécessite un serveur avec STARTTLS activé, sinon toutes les "
+"tentatives d'authentification échoueront."
 
 #. module: users_ldap
 #: view:res.company:0
@@ -79,6 +82,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"Compte utilisateur sur le serveur LDAP qui est utilisé pour interroger "
+"l'annuaire. Laisser vide pour se connecter anonymement."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -88,12 +93,12 @@ msgstr "Base LDAP"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Information utilisateur"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -103,7 +108,7 @@ msgstr "Sociétés"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Paramètre du processus"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -113,7 +118,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Utiliser TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -123,17 +128,17 @@ msgstr "Séquence"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Information de connexion"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Information sur le serveur"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Configurer votre serveur LDAP"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
@@ -151,6 +156,8 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"Le mot de passe du compte d'utilisateur sur le serveur LDAP qui est utilisé "
+"pour interroger l'annuaire."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
diff --git a/addons/users_ldap/i18n/gl.po b/addons/users_ldap/i18n/gl.po
index 48ac520a75a..b83d119a421 100644
--- a/addons/users_ldap/i18n/gl.po
+++ b/addons/users_ldap/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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/hr.po b/addons/users_ldap/i18n/hr.po
index bdf09f90531..cd84c9699dd 100644
--- a/addons/users_ldap/i18n/hr.po
+++ b/addons/users_ldap/i18n/hr.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/hu.po b/addons/users_ldap/i18n/hu.po
index d82db28d5a6..ba44c610cf5 100644
--- a/addons/users_ldap/i18n/hu.po
+++ b/addons/users_ldap/i18n/hu.po
@@ -15,8 +15,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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/it.po b/addons/users_ldap/i18n/it.po
index 4f7fb730b94..a832a7dc4b0 100644
--- a/addons/users_ldap/i18n/it.po
+++ b/addons/users_ldap/i18n/it.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -86,12 +86,12 @@ msgstr "LDAP base"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Informazioni Utente"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Il nome azienda deve essere unico!"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -101,7 +101,7 @@ msgstr "Aziende"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Parametro Processo"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -111,7 +111,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Usa TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -121,17 +121,17 @@ msgstr "Sequenza"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Informazioni di accesso"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Informazioni sul server"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Crea il tuo server LDAP"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
@@ -149,6 +149,8 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"La password dell'account utente sul server LDAP che viene utilizzata per "
+"interrogare la directory."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
diff --git a/addons/users_ldap/i18n/ja.po b/addons/users_ldap/i18n/ja.po
index 79bdcb4ef59..029a25cda78 100644
--- a/addons/users_ldap/i18n/ja.po
+++ b/addons/users_ldap/i18n/ja.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-06-17 04:35+0000\n"
-"X-Generator: Launchpad (build 15419)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/mn.po b/addons/users_ldap/i18n/mn.po
index 8847b32c1ca..940d6148fcc 100644
--- a/addons/users_ldap/i18n/mn.po
+++ b/addons/users_ldap/i18n/mn.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/nl.po b/addons/users_ldap/i18n/nl.po
index fef0cfd75fc..303970220aa 100644
--- a/addons/users_ldap/i18n/nl.po
+++ b/addons/users_ldap/i18n/nl.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-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
index a20d5abea06..9fca5489ceb 100644
--- a/addons/users_ldap/i18n/pl.po
+++ b/addons/users_ldap/i18n/pl.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/pt.po b/addons/users_ldap/i18n/pt.po
index 52a59cfc579..fa8f50f053e 100644
--- a/addons/users_ldap/i18n/pt.po
+++ b/addons/users_ldap/i18n/pt.po
@@ -14,20 +14,19 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não se pode criar empresas recursivamente."
+msgstr "Erro! Não pode criar empresas recursivas."
 
 #. module: users_ldap
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"A empresa escolhida não faz parte das possíveis de serem selecionadas para "
-"este utilizador"
+"A empresa escolhida não está entre as permitidas para este utilizador"
 
 #. module: users_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -79,6 +78,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"A conta do utilizador no servidor LDAP que é usada para consultar o "
+"diretório. Deixe em branco para ligar anonimamente."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -88,12 +89,12 @@ msgstr "LDAP base"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Informação do Utilizador"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -103,7 +104,7 @@ msgstr "Empresas"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Parâmetro de Processamento"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
@@ -113,7 +114,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Usar TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -123,22 +124,22 @@ msgstr "Sequência"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Informação de Login"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Informação do Servidor"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Configure o seus servidor LDAP"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Não se pode ter dois utilizadores com os mesmos dados de acesso"
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
 
 #. module: users_ldap
 #: field:res.company,ldaps:0
@@ -150,7 +151,7 @@ msgstr "Parâmetros de LDAP"
 msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
-msgstr ""
+msgstr "A senha da conta de acesso ao servidor LDAP usado pela query."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
@@ -160,7 +161,7 @@ msgstr "Senha de LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,user:0
 msgid "Model User"
-msgstr "Utilizador modelo"
+msgstr "Utilizador Modelo"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
@@ -175,7 +176,7 @@ msgstr "Filtro LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
-msgstr "Criar utitizador"
+msgstr "Criar Utilizador"
 
 #~ msgid "Authenticate users with ldap server"
 #~ msgstr "Autenticar utilizadores com um servidor LDAP"
diff --git a/addons/users_ldap/i18n/pt_BR.po b/addons/users_ldap/i18n/pt_BR.po
index f1d60d8630e..2558123ad28 100644
--- a/addons/users_ldap/i18n/pt_BR.po
+++ b/addons/users_ldap/i18n/pt_BR.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/ro.po b/addons/users_ldap/i18n/ro.po
index 3f78a3bb652..f6666a8af76 100644
--- a/addons/users_ldap/i18n/ro.po
+++ b/addons/users_ldap/i18n/ro.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
@@ -26,7 +26,7 @@ msgstr "Eroare! Nu puteti crea companii recursive."
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Compania aleasă nu se află printre companiile permise acestui utilizator"
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
 
 #. module: users_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -35,6 +35,9 @@ msgid ""
 "option requires a server with STARTTLS enabled, otherwise all authentication "
 "attempts will fail."
 msgstr ""
+"Este necesara criptarea sigura TLS/SSl atunci cand va conectati la serverul "
+"LDAP. Aceasta optiune necesita un server cu STARTTLS activat, altfel toate "
+"incercarile de autentificare vor esua."
 
 #. module: users_ldap
 #: view:res.company:0
@@ -50,7 +53,7 @@ msgstr "LDAP sistem binddn"
 #. module: users_ldap
 #: help:res.company.ldap,create_user:0
 msgid "Create the user if not in database"
-msgstr "Creează utilizator dacă nu este in baza de date"
+msgstr "Creeaza utilizator daca nu se afla in baza de date"
 
 #. module: users_ldap
 #: help:res.company.ldap,user:0
@@ -65,7 +68,7 @@ msgstr "Companie"
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server:0
 msgid "LDAP Server address"
-msgstr "Adresă Server LDAP"
+msgstr "Adresa Server LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_server_port:0
@@ -78,6 +81,8 @@ msgid ""
 "The user account on the LDAP server that is used to query the directory. "
 "Leave empty to connect anonymously."
 msgstr ""
+"Contul utilizatorului in serverul LDAP care este folosit pentru a cauta "
+"directoarea. Lasati necompletat pentru a va conecta anonim."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -87,12 +92,12 @@ msgstr "Baza LDAP"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "User Information"
-msgstr ""
+msgstr "Informatii utilizator"
 
 #. module: users_ldap
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie să fie unic !"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company
@@ -102,37 +107,37 @@ msgstr "Companii"
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Parametri proces"
 
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_company_ldap
 msgid "res.company.ldap"
-msgstr "res.company.ldap"
+msgstr "res.ldap.companie"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_tls:0
 msgid "Use TLS"
-msgstr ""
+msgstr "Utilizeaza TLS"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Login Information"
-msgstr ""
+msgstr "Informatii de autentificare"
 
 #. module: users_ldap
 #: view:res.company.ldap:0
 msgid "Server Information"
-msgstr ""
+msgstr "Informatii Server"
 
 #. module: users_ldap
 #: model:ir.actions.act_window,name:users_ldap.action_ldap_installer
 msgid "Setup your LDAP Server"
-msgstr ""
+msgstr "Configurati-va Serverul d-voastra LDAP"
 
 #. module: users_ldap
 #: sql_constraint:res.users:0
@@ -150,6 +155,8 @@ msgid ""
 "The password of the user account on the LDAP server that is used to query "
 "the directory."
 msgstr ""
+"Parola contului utilizatorului din serverul LDAP care este folosita pentru a "
+"cauta directoarea."
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_password:0
@@ -164,7 +171,7 @@ msgstr "Model Utilizator"
 #. module: users_ldap
 #: model:ir.model,name:users_ldap.model_res_users
 msgid "res.users"
-msgstr "res.users (res.utilizatori)"
+msgstr "res.utilizatori"
 
 #. module: users_ldap
 #: field:res.company.ldap,ldap_filter:0
@@ -174,7 +181,7 @@ msgstr "Filtru LDAP"
 #. module: users_ldap
 #: field:res.company.ldap,create_user:0
 msgid "Create user"
-msgstr "Creează utilizator"
+msgstr "Creare utilizator"
 
 #~ msgid "Authenticate users with ldap server"
 #~ msgstr "Autentifică utilizatorii cu serverul ldap"
diff --git a/addons/users_ldap/i18n/ru.po b/addons/users_ldap/i18n/ru.po
index 9c30e588880..3303a0473aa 100644
--- a/addons/users_ldap/i18n/ru.po
+++ b/addons/users_ldap/i18n/ru.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/sv.po b/addons/users_ldap/i18n/sv.po
index 47cd3c95ec1..cfb15d1654a 100644
--- a/addons/users_ldap/i18n/sv.po
+++ b/addons/users_ldap/i18n/sv.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-06-24 05:28+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/tr.po b/addons/users_ldap/i18n/tr.po
index f4aee585cd0..eb1b8bacfbe 100644
--- a/addons/users_ldap/i18n/tr.po
+++ b/addons/users_ldap/i18n/tr.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-02-11 05:09+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/i18n/zh_CN.po b/addons/users_ldap/i18n/zh_CN.po
index fb688865d7b..1c19d7cd168 100644
--- a/addons/users_ldap/i18n/zh_CN.po
+++ b/addons/users_ldap/i18n/zh_CN.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-02-09 07:08+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:25+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 40d01f43bf3..b87800aa8c8 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,30 +7,32 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">
-                    <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration" version="7.0">
-                            <group col="4">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="LDAP Parameters">
+                        <field name="ldaps" nolabel="1" colspan="4">
+                            <form string="LDAP Configuration" version="7.0">
+                                <group col="4">
+                                    <field name="ldap_server"/>
+                                    <field name="ldap_server_port"/>
+                                    <field name="ldap_binddn"/>
+                                    <field name="ldap_password"/>
+                                    <field name="ldap_base"/>
+                                    <field name="ldap_filter"/>
+                                    <field name="create_user"/>
+                                    <field name="user"/>
+                                    <newline/>
+                                    <field name="sequence"/>
+                                    <field name="ldap_tls"/>
+                                </group>
+                            </form>
+                            <tree string="LDAP Configuration">
+                                <field name="sequence"/>
                                 <field name="ldap_server"/>
                                 <field name="ldap_server_port"/>
-                                <field name="ldap_binddn"/>
-                                <field name="ldap_password"/>
                                 <field name="ldap_base"/>
-                                <field name="ldap_filter"/>
-                                <field name="create_user"/>
-                                <field name="user"/>
-                                <newline/>
-                                <field name="sequence"/>
-                                <field name="ldap_tls"/>
-                            </group>
-                        </form>
-                        <tree string="LDAP Configuration">
-                            <field name="sequence"/>
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_base"/>
-                        </tree>
-                    </field>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
             </field>
         </record>