From 12995e2b70d8dc9f666831a46326df13ef7d4443 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 22 Jul 2011 15:25:28 +0000 Subject: [PATCH] Trad: More accurate trad --- build/deb/dolibarr.desktop | 4 +-- build/rpm/dolibarr.desktop | 2 +- htdocs/comm/action/index.php | 35 +++++++++---------- .../install/mysql/migration/3.0.0-3.1.0.sql | 4 ++- htdocs/langs/ca_ES/admin.lang | 4 +-- htdocs/langs/ca_ES/companies.lang | 2 +- htdocs/langs/es_ES/admin.lang | 4 +-- htdocs/langs/es_ES/companies.lang | 2 +- htdocs/lib/agenda.lib.php | 14 ++++---- 9 files changed, 35 insertions(+), 36 deletions(-) diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index ec209a86deb..a48e5048dff 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: x-www-browser +# For Debian/Ubuntu: xdg-open or x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) -Exec=x-www-browser http://localhost/dolibarr +Exec=xdg-open http://localhost/dolibarr Icon=dolibarr Terminal=false Type=Application diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index ab2a758867f..33fadf7624f 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: x-www-browser +# For Debian/Ubuntu: xdg-open or x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) Exec=xdg-open http://localhost/dolibarr Icon=dolibarr diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 08e7d071cab..05e52bded62 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -24,7 +24,7 @@ * \file htdocs/comm/action/index.php * \ingroup agenda * \brief Home page of calendar events - * \version $Id$ + * \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ */ require("../../main.inc.php"); @@ -487,24 +487,23 @@ if ($showbirthday) //Exernal Calendars $listofextcals=array(); -if ($conf->global->MAIN_FEATURES_LEVEL>=2) + +if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) { - if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) - { - $i=0; - while($i < $conf->global->AGENDA_EXT_NB) - { - $i++; - $paramkey='AGENDA_EXT_SRC'.$i; - $url=$conf->global->$paramkey; - $paramkey='AGENDA_EXT_NAME'.$i; - $namecal = $conf->global->$paramkey; - $paramkey='AGENDA_EXT_COLOR'.$i; - $colorcal = $conf->global->$paramkey; - if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); - } - } + $i=0; + while($i < $conf->global->AGENDA_EXT_NB) + { + $i++; + $paramkey='AGENDA_EXT_SRC'.$i; + $url=$conf->global->$paramkey; + $paramkey='AGENDA_EXT_NAME'.$i; + $namecal = $conf->global->$paramkey; + $paramkey='AGENDA_EXT_COLOR'.$i; + $colorcal = $conf->global->$paramkey; + if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); + } } + if (sizeof($listofextcals)) { require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php"); @@ -787,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format '; */ -llxFooter('$Date$ - $Revision$'); +llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); /** 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 bad27534494..70ce4611860 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.79 2011/07/12 22:12:12 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.80 2011/07/22 13:46:34 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -124,7 +124,9 @@ 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 d04d2711843..87a8cd1edcc 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 (casa mare) -CompanyHour=Hora empresa (casa mare) +CompanyTZ=Zona Horària empresa (seu central) +CompanyHour=Hora empresa (seu central) 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 77e2e4adb78..df7dbb0ab90 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=Casa mare +ParentCompany=Seu Central Subsidiary=Filial Subsidiaries=Filials NoSubsidiary=Cap filial diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 841addc52af..eb268695a5c 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 (casa madre) -CompanyHour=Hora empresa (casa madre) +CompanyTZ=Zona Horaria empresa (sede central) +CompanyHour=Hora empresa (sede central) 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 23d49bba0a2..7f2e6f9fdf4 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=Casa madre +ParentCompany=Sede central Subsidiary=Filial Subsidiaries=Filiales NoSubsidiary=Ninguna filial diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php index 91a96d0e6e2..d47b327541d 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/lib/agenda.lib.php @@ -22,7 +22,7 @@ /** * \file htdocs/lib/agenda.lib.php * \brief Set of function for the agenda module - * \version $Id$ + * \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ */ @@ -324,13 +324,11 @@ function agenda_prepare_head() $head[$h][2] = 'xcal'; $h++; - if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // In dev version only for the moment - { - $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; - $head[$h][1] = $langs->trans("ExtSites"); - $head[$h][2] = 'extsites'; - $h++; - } + $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; + $head[$h][1] = $langs->trans("ExtSites"); + $head[$h][2] = 'extsites'; + $h++; + return $head; }