diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop
index a48e5048dff..ec209a86deb 100644
--- a/build/deb/dolibarr.desktop
+++ b/build/deb/dolibarr.desktop
@@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: xdg-open or x-www-browser
+# For Debian/Ubuntu: x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
-Exec=xdg-open http://localhost/dolibarr
+Exec=x-www-browser http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop
index 33fadf7624f..ab2a758867f 100755
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -13,7 +13,7 @@ Comment[it]=Programma gestionale open source e gratuito per piccole e medie impr
 Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 # Command to open an URL
 # For Fedora: xdg-open 
-# For Debian/Ubuntu: xdg-open or x-www-browser
+# For Debian/Ubuntu: x-www-browser
 # (exo-open for xfde, gnome-open for gnome, ...)
 Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index 70ce4611860..bad27534494 100755
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -1,5 +1,5 @@
 --
--- $Id: 3.0.0-3.1.0.sql,v 1.80 2011/07/22 13:46:34 eldy Exp $
+-- $Id: 3.0.0-3.1.0.sql,v 1.79 2011/07/12 22:12:12 eldy Exp $
 --
 -- Be carefull to requests order.
 -- This file must be loaded by calling /install/index.php page
@@ -124,9 +124,7 @@ ALTER TABLE llx_usergroup_user DROP INDEX fk_user;
 ALTER TABLE llx_usergroup_user DROP INDEX uk_user_group_entity;
 ALTER TABLE llx_usergroup_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
 ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup);
--- V4.1 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user      FOREIGN KEY (fk_user)         REFERENCES llx_user (rowid);
--- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup)    REFERENCES llx_usergroup (rowid);
 
 ALTER TABLE llx_commande ADD COLUMN ref_int	varchar(30) AFTER ref_ext;
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 87a8cd1edcc..d04d2711843 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons)
 ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons)
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horària empresa (seu central)
-CompanyHour=Hora empresa (seu central)
+CompanyTZ=Zona Horària empresa (casa mare)
+CompanyHour=Hora empresa (casa mare)
 CurrentSessionTimeOut=Time out sessió actual
 OSEnv=Entorn SO
 Box=Panell
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index df7dbb0ab90..77e2e4adb78 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -48,7 +48,7 @@ Individual=Particular
 ToCreateContactWithSameName=Crearà automàticament un contacte físic amb la mateixa informació
 ReportByCustomers=Informe per client
 ReportByQuarter=Informe per tasa
-ParentCompany=Seu Central
+ParentCompany=Casa mare
 Subsidiary=Filial
 Subsidiaries=Filials
 NoSubsidiary=Cap filial
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index eb268695a5c..841addc52af 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -109,8 +109,8 @@ PHPServerOffsetWithGreenwich=Offset servidor con Greenwich (segundos)
 ClientOffsetWithGreenwich=Offset cliente/navegador con Greenwich (segundos)
 DaylingSavingTime=Horario de verano (usuario)
 CurrentHour=Hora PHP (servidor)
-CompanyTZ=Zona Horaria empresa (sede central)
-CompanyHour=Hora empresa (sede central)
+CompanyTZ=Zona Horaria empresa (casa madre)
+CompanyHour=Hora empresa (casa madre)
 CurrentSessionTimeOut=Time out sesión actual
 OSEnv=Entorno SO
 Box=Panel
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 7f2e6f9fdf4..23d49bba0a2 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -48,7 +48,7 @@ Individual=Particular
 ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información
 ReportByCustomers=Informe por cliente
 ReportByQuarter=Informe por tasa
-ParentCompany=Sede central
+ParentCompany=Casa madre
 Subsidiary=Filial
 Subsidiaries=Filiales
 NoSubsidiary=Ninguna filial