From 8207b7c2437380b75dc06a6441a3a99c49eb08dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:27:17 +0100 Subject: [PATCH 1/5] Missing translation --- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c78fb76281f..7ad649c736a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1011,6 +1011,7 @@ AddRefInList=Display customer/supplier ref into list (select list or combobox) a FieldEdition=Edition of field %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +MemcachedModuleAvailableButNotSetup=Memcached accelerator module enabled but setup not complete ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 58805dffb1d..f07f37580fb 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1053,6 +1053,7 @@ AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou FieldEdition=Édition du champ %s FixTZ=Correction du Timezone FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) +MemcachedModuleAvailableButNotSetup=Module d'accélération memcached activé mais non configuré. ##### Module password generation PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement. From 29ae579298f0ea1f3caff17b1244ec9658140f1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:29:30 +0100 Subject: [PATCH 2/5] Fix: Bad link --- htdocs/admin/system/perf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index de33508fba8..ce74d128a7a 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -89,7 +89,7 @@ $test1=function_exists('xcache_info'); if ($test1) { print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled"); - print ' '.$langs->trans("MoreInformation").' Xcache admin page'; + print ' '.$langs->trans("MoreInformation").' Xcache admin page'; } else { From 8248f6382695079cefeec2d0a3a9221a45fd3e5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:31:57 +0100 Subject: [PATCH 3/5] Fix: Missing translation --- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7ad649c736a..6d55c841051 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1012,6 +1012,7 @@ FieldEdition=Edition of field %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) MemcachedModuleAvailableButNotSetup=Memcached accelerator module enabled but setup not complete +MemcachedAvailableAndSetup=Memcached accelerator module enabled and setup complete ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index f07f37580fb..e5fe0126f4a 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1053,7 +1053,8 @@ AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou FieldEdition=Édition du champ %s FixTZ=Correction du Timezone FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) -MemcachedModuleAvailableButNotSetup=Module d'accélération memcached activé mais non configuré. +MemcachedModuleAvailableButNotSetup=Module d'accélération Memcached activé mais non configuré. +MemcachedAvailableAndSetup=Module d'accélération Memcached activé et configuré. ##### Module password generation PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement. From 5960e9e36126b2ba54e0b63dfa8ea325f244807b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Dec 2013 00:24:57 +0100 Subject: [PATCH 4/5] Update doc --- build/debian/README.howto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/debian/README.howto b/build/debian/README.howto index cbd4e13f993..6cc18aa6db0 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -117,7 +117,9 @@ Pour lister les env chroot Puis pour se connecter et préparer l'environnement > schroot -c name_of_chroot > vi /usr/sbin/policy-rc.d and replace return code 101 (not allowed) into 0 (ok) -> apt-get install links mysql-client +> apt-get install links mysql-client lintian pkg-php-tools +If you get error syntax error: unknown group 'Debian-exim' in statoverride file, +edit file /var/lib/dpkg/statoverride Pour tester un package > cp *.deb /srv/chroot/unstable/tmp From 3e39cd279daef5bdf5e387f5b4248bb1b54b95be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Dec 2013 00:42:53 +0100 Subject: [PATCH 5/5] Fix: avoid to include not desired directory --- build/exe/doliwamp/doliwamp.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 98bfeee9109..61ece7a1a20 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -109,7 +109,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m ; Mysql data files (does not overwrite if exists) Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db" ; Dolibarr -Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php" +Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php" Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*" Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png" Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"