diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a854c706c4c..2261e8ee70d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7819,7 +7819,7 @@ abstract class CommonObject
$form = new Form($this->db);
}
- $label = empty($val['label']) ? '' : $val['label'];
+ //$label = empty($val['label']) ? '' : $val['label'];
$type = empty($val['type']) ? '' : $val['type'];
$size = empty($val['css']) ? '' : $val['css'];
$reg = array();
@@ -8222,7 +8222,8 @@ abstract class CommonObject
$value = '';
}
} elseif ($type == 'password') {
- $value = preg_replace('/./i', '*', $value);
+ $value = ''.$langs->trans("Encrypted").'';
+ //$value = preg_replace('/./i', '*', $value);
} elseif ($type == 'array') {
$value = implode(' ', $value);
} else { // text|html|varchar
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 79272f0b6f5..fac5f950a30 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -685,7 +685,7 @@ Module5000Desc=Allows you to manage multiple companies
Module6000Name=Inter-modules Workflow
Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
Module10000Name=Websites
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=CMS to create websites with a WYSIWYG editor. This is a webmaster or developer oriented Content Management System (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
Module20000Name=Leave Request Management
Module20000Desc=Define and track employee leave requests
Module39000Name=Product Lots
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index cb2f8bedde5..8c144fbae3e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1260,4 +1260,4 @@ AmountSalary=Salary amount
InvoiceSubtype=Invoice subtype
ConfirmMassReverse=Bulk Reverse confirmation
ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
-
+Encrypted=Encrypted
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index b64930a8855..7a808ed6c38 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -161,8 +161,8 @@ Visibility=Visibility
Everyone=Everyone
AssignedContacts=Assigned contacts
WebsiteTypeLabel=Type of Web site
-WebsiteTypeDolibarrWebsite=Web site (Module WebSite)
-WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module WebPortal)
+WebsiteTypeDolibarrWebsite=Web site (Module WebSites CMS)
+WebsiteTypeDolibarrPortal=Native and ready to use web portal (Module Web Portal)
WebPortalURL=Web portal URL
NewWebsiteAccount=New accounts for websites
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 2547a9c00c4..311135feb07 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -81,7 +81,7 @@ class SocieteAccount extends CommonObject
'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
- 'pass_crypted' => array('type'=>'password', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
+ 'pass_crypted' => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
'pass_temp' => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth300 widthcentpercentminusxx'),
'site' => array('type'=>'varchar(128)', 'label'=>'WebsiteTypeLabel', 'visible'=>0, 'enabled'=>0, 'position'=>41, 'notnull'=>1, 'default' => '', 'help'=>'Name of the website or service if this is account on an external website or service'),
diff --git a/htdocs/webportal/admin/configcss.php b/htdocs/webportal/admin/configcss.php
index 4ea291a5c72..56842f4cf74 100644
--- a/htdocs/webportal/admin/configcss.php
+++ b/htdocs/webportal/admin/configcss.php
@@ -137,7 +137,7 @@ print '';
print '