Merge lp:~jfb-tempo-consulting/unifield-web/us-1762 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2016-08-26 15:39:34 +0000
+++ addons/openerp/controllers/database.py	2016-10-03 14:48:25 +0000
@@ -110,8 +110,8 @@
         openobject.widgets.TextField(name='dbname', label=_('New database name:'), validator=formencode.validators.NotEmpty(), help=_("Choose the name of the database that will be created. The name must not contain any special character. Exemple: 'terp'.")),
 #       openobject.widgets.CheckBox(name='demo_data', label=_('Load Demonstration data:'), default=False, validator=validators.Bool(if_empty=False), help=_("Check this box if you want demonstration data to be installed on your new database. These data will help you to understand OpenERP, with predefined products, partners, etc.")),
         openobject.widgets.SelectField(name='language', options=get_lang_list, validator=validators.String(), label=_('Default Language:'), help=_("Choose the default language that will be installed for this database. You will be able to install new languages after installation through the administration menu.")),
-        ReplacePasswordField(name='confirm_password', label=_('Confirm password:'), help=_("This is the password of the 'admin' user that will be created in your new database. It has to be the same than the above field.")),
         ReplacePasswordField(name='admin_password', label=_('Administrator password:'), help=_("This is the password of the 'admin' user that will be created in your new database.")),
+        ReplacePasswordField(name='confirm_password', label=_('Confirm administrator password:'), help=_("This is the password of the 'admin' user that will be created in your new database. It has to be the same than the above field.")),
     ]
     validator = openobject.validators.Schema(chained_validators=[formencode.validators.FieldsMatch("admin_password","confirm_password")])
 
 
=== modified file 'addons/openerp/po/messages/ar.po'
--- addons/openerp/po/messages/ar.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ar.po	2016-10-03 14:48:25 +0000
@@ -176,7 +176,7 @@
 msgstr "هذه كلمة مرور المشرف 'admin' و التي ستستخدم بقاعدة البيانات الجديدة"
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "تأكيد كلمة المرور:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/bg.po'
--- addons/openerp/po/messages/bg.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/bg.po	2016-10-03 14:48:25 +0000
@@ -182,7 +182,7 @@
 "нова база данни."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Потвърдете паролата:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/ca.po'
--- addons/openerp/po/messages/ca.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ca.po	2016-10-03 14:48:25 +0000
@@ -186,7 +186,7 @@
 "base de dades."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirma contrasenya:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/da.po'
--- addons/openerp/po/messages/da.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/da.po	2016-10-03 14:48:25 +0000
@@ -180,7 +180,7 @@
 "database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Bekræft adgangskode:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/de.po'
--- addons/openerp/po/messages/de.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/de.po	2016-10-03 14:48:25 +0000
@@ -189,7 +189,7 @@
 "verwendet."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Passwort bestätigen:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/en_AU.po'
--- addons/openerp/po/messages/en_AU.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/en_AU.po	2016-10-03 14:48:25 +0000
@@ -171,7 +171,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr ""
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/en_CA.po'
--- addons/openerp/po/messages/en_CA.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/en_CA.po	2016-10-03 14:48:25 +0000
@@ -184,7 +184,7 @@
 "database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirm password:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/en_GB.po'
--- addons/openerp/po/messages/en_GB.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/en_GB.po	2016-10-03 14:48:25 +0000
@@ -184,7 +184,7 @@
 "database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirm password:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/es.po'
--- addons/openerp/po/messages/es.po	2015-05-13 15:01:35 +0000
+++ addons/openerp/po/messages/es.po	2016-10-03 14:48:25 +0000
@@ -188,7 +188,7 @@
 "datos."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmar contraseña:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/es_CL.po'
--- addons/openerp/po/messages/es_CL.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/es_CL.po	2016-10-03 14:48:25 +0000
@@ -190,7 +190,7 @@
 "de datos."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmar contraseña:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/et.po'
--- addons/openerp/po/messages/et.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/et.po	2016-10-03 14:48:25 +0000
@@ -167,7 +167,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr ""
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/eu.po'
--- addons/openerp/po/messages/eu.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/eu.po	2016-10-03 14:48:25 +0000
@@ -181,7 +181,7 @@
 "Zure datu basean sortuko den 'admin' erabiltzailearen pasahitza da hau."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Pasahitza berretsi:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/fi.po'
--- addons/openerp/po/messages/fi.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/fi.po	2016-10-03 14:48:25 +0000
@@ -182,7 +182,7 @@
 "tietokannassasi."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Vahvista salasana:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2015-05-28 10:07:02 +0000
+++ addons/openerp/po/messages/fr.po	2016-10-03 14:48:25 +0000
@@ -201,8 +201,8 @@
 "nouvelle base de données."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
-msgstr "Confirmez le mot de passe :"
+msgid "Confirm administrator password:"
+msgstr "Confirmez le mot de passe administrateur:"
 
 #: controllers/database.py:73
 msgid ""
 
=== modified file 'addons/openerp/po/messages/gl.po'
--- addons/openerp/po/messages/gl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/gl.po	2016-10-03 14:48:25 +0000
@@ -186,7 +186,7 @@
 "datos."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmar contrasinal:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/he.po'
--- addons/openerp/po/messages/he.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/he.po	2016-10-03 14:48:25 +0000
@@ -169,7 +169,7 @@
 msgstr "זוהי הסיסמה של המשתמש \"admin\" שיווצר במסד הנתונים החדש שלך."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "אימות סיסמא:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/hr.po'
--- addons/openerp/po/messages/hr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/hr.po	2016-10-03 14:48:25 +0000
@@ -181,7 +181,7 @@
 "podataka."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Potvrda lozinke:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/hu.po'
--- addons/openerp/po/messages/hu.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/hu.po	2016-10-03 14:48:25 +0000
@@ -183,7 +183,7 @@
 "adatbázist."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Jelszó megerősítése:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/id.po'
--- addons/openerp/po/messages/id.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/id.po	2016-10-03 14:48:25 +0000
@@ -183,7 +183,7 @@
 "Anda."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Konfirmasi password:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/it.po'
--- addons/openerp/po/messages/it.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/it.po	2016-10-03 14:48:25 +0000
@@ -186,7 +186,7 @@
 "nel tuo nuovo database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Conferma password:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/lt.po'
--- addons/openerp/po/messages/lt.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/lt.po	2016-10-03 14:48:25 +0000
@@ -183,7 +183,7 @@
 "bazėje."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Patvirtinkite slaptažodį:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/lv.po'
--- addons/openerp/po/messages/lv.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/lv.po	2016-10-03 14:48:25 +0000
@@ -177,7 +177,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Apstipriniet paroli:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/mk.po'
--- addons/openerp/po/messages/mk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/mk.po	2016-10-03 14:48:25 +0000
@@ -174,7 +174,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr ""
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/mn.po'
--- addons/openerp/po/messages/mn.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/mn.po	2016-10-03 14:48:25 +0000
@@ -179,7 +179,7 @@
 msgstr "'admin' хэрэглэгчийн нууц үгээр шинэ өгөгдлийн сан үүсгэнэ."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Нууц үг давт"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/nb.po'
--- addons/openerp/po/messages/nb.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/nb.po	2016-10-03 14:48:25 +0000
@@ -179,7 +179,7 @@
 "Dette er passordet for 'admin' brukeren som opprettes i din nye database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Bekreft passord:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/nl.po'
--- addons/openerp/po/messages/nl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/nl.po	2016-10-03 14:48:25 +0000
@@ -185,7 +185,7 @@
 "nieuwe database."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Bevestig wachtwoord:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/pl.po'
--- addons/openerp/po/messages/pl.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/pl.po	2016-10-03 14:48:25 +0000
@@ -185,7 +185,7 @@
 "danych."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Potwierdź hasło:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/pt.po'
--- addons/openerp/po/messages/pt.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/pt.po	2016-10-03 14:48:25 +0000
@@ -183,7 +183,7 @@
 "dados."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmar senha:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/pt_BR.po'
--- addons/openerp/po/messages/pt_BR.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/pt_BR.po	2016-10-03 14:48:25 +0000
@@ -186,7 +186,7 @@
 "dados."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmar senha:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/ro.po'
--- addons/openerp/po/messages/ro.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ro.po	2016-10-03 14:48:25 +0000
@@ -179,7 +179,7 @@
 "date."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Confirmați parola:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/ru.po'
--- addons/openerp/po/messages/ru.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/ru.po	2016-10-03 14:48:25 +0000
@@ -184,7 +184,7 @@
 "данных."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Подтверждение пароля:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/sk.po'
--- addons/openerp/po/messages/sk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/sk.po	2016-10-03 14:48:25 +0000
@@ -179,7 +179,7 @@
 "databáze."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Potvrdenie hesla:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/sr.po'
--- addons/openerp/po/messages/sr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/sr.po	2016-10-03 14:48:25 +0000
@@ -170,7 +170,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Potvrdi Lozinku:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/[e-mail]'
--- addons/openerp/po/messages/[e-mail]	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/[e-mail]	2016-10-03 14:48:25 +0000
@@ -181,7 +181,7 @@
 "bazi podataka."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Potvrdite lozinku:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/sv.po'
--- addons/openerp/po/messages/sv.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/sv.po	2016-10-03 14:48:25 +0000
@@ -172,7 +172,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Upprepa lösenord:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/th.po'
--- addons/openerp/po/messages/th.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/th.po	2016-10-03 14:48:25 +0000
@@ -167,7 +167,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "ยืนยันรหัสผ่าน:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/tr.po'
--- addons/openerp/po/messages/tr.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/tr.po	2016-10-03 14:48:25 +0000
@@ -182,7 +182,7 @@
 msgstr "Yeni oluşturulacak veritabanındaki 'admin' kullanıcısının şifresi."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Parolayı tekrarla:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/uk.po'
--- addons/openerp/po/messages/uk.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/uk.po	2016-10-03 14:48:25 +0000
@@ -183,7 +183,7 @@
 "даних."
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Підтвердіть пароль:"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/vi.po'
--- addons/openerp/po/messages/vi.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/vi.po	2016-10-03 14:48:25 +0000
@@ -169,7 +169,7 @@
 msgstr ""
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "Xác nhận mật khẩu"
 
 #: controllers/database.py:73
 
=== modified file 'addons/openerp/po/messages/zh_CN.po'
--- addons/openerp/po/messages/zh_CN.po	2011-08-04 05:14:27 +0000
+++ addons/openerp/po/messages/zh_CN.po	2016-10-03 14:48:25 +0000
@@ -169,7 +169,7 @@
 msgstr "这是将与“系统管理员”用户一同创建的新数据库的密码。"
 
 #: controllers/database.py:73
-msgid "Confirm password:"
+msgid "Confirm administrator password:"
 msgstr "确认管理员密码:"
 
 #: controllers/database.py:73