diff --git a/build/debian/README.howto b/build/debian/README.howto
index 9c3dbc9ad07164f0fa620c82942f48b8db07abbe..797e653bc278d7ae45998673f669d1d1aefe3fc4 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -13,7 +13,7 @@ with format .DEB (for Debian, Ubuntu, ...).
 
 # This is standard command to work on Debian packaging:
 #
-# gpg --gen-key                          Generate a GPG key
+# gpg --gen-key                          Generate a GPG key (-> pubring.gpg + secring.gpg)
 #
 # debconf-updatepo					     		To run into po dir to regenate templates.pot
 # podebconf-report-po --from email@email.com	To send email to ask translations
@@ -43,10 +43,11 @@ To submit a package to Debian:
 See page http://www.debian.org/devel/wnpp/#l1 for example of ITP requests contents.
 
 - Wait until you received bug number.
-For first ITP submission of Dolibarr, bug id was 634783.
+  For first ITP submission of Dolibarr, bug id was 634783.
 
-- Check bug is into database by searching with id on http://www.debian.org/Bugs/
- 
+- Check bug is into database by searching with id on 
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634783
+  
 - Add a line for upstream into file changelog with bug number
 
 - Call for a mentor on ML debian-mentors to upload packages
diff --git a/build/debian/changelog b/build/debian/changelog
index 8a995f9f778ea60a2bd859789c5492e27458cd58..17a361e4ae0d3bf7e7d1d1db6ad1e2ba356a5eff 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -4,6 +4,6 @@ dolibarr (3.4.0+nmu1) unstable; urgency=low
   * New upstream release.
     closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Sat, 2 Mar 2013 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 22 Apr 2013 12:00:00 +0100     
 
 # For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  
diff --git a/build/debian/po/fr.po b/build/debian/po/fr.po
index a96cd360299c95a90d069f6565471d4008e9febe..d23da598297a82c33fc669df96dab6fc73986a71 100755
--- a/build/debian/po/fr.po
+++ b/build/debian/po/fr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: 2011-07-29 22:45+0100\n"
 "Last-Translator: Laurent Destailleur <eldy@users.sourceforge.net>\n"
 "Language-Team: Laurent Destailleur <eldy@users.sourceforge.net>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr "Seveur web à reconfigurer automatiquement:"
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -44,14 +44,14 @@ msgstr ""
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr "Effacer la base de donnée et les fichiers uploadés ?"
 
 #
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
diff --git a/build/debian/po/templates.pot b/build/debian/po/templates.pot
old mode 100755
new mode 100644
index 8813bd2d45bdb32ad6f08583fe523ef091f5792a..90b57278e049bed465351d56c5d9faa0bf0f2a9c
--- a/build/debian/po/templates.pot
+++ b/build/debian/po/templates.pot
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 18:17+0200\n"
+"Project-Id-Version: dolibarr\n"
+"Report-Msgid-Bugs-To: dolibarr@packages.debian.org\n"
+"POT-Creation-Date: 2013-04-23 12:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,13 +19,13 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid "Web server to reconfigure automatically:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../templates:1001
+#: ../dolibarr.templates:1001
 msgid ""
 "Please choose the web server that should be automatically configured to run "
 "dolibarr."
@@ -32,13 +33,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid "Delete database and uploaded files ?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:2001
+#: ../dolibarr.templates:2001
 msgid ""
 "Answer if you want to removed the Dolibarr MySQL database and all other "
 "datas (datas related to this question are the Dolibarr DBMS account, all "
diff --git a/build/debian/rules b/build/debian/rules
index 5a1cfdc8ecbb76568a2306f5e0032e90d9f3854a..2ab8af290c1ff8929cf24057dca864eb4009dc04 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -111,6 +111,9 @@ clean:
 	rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
 	rm -fr htdocs/includes/tcpdf/fonts/utils
 
+	# clean from files to avoid warning of missing dependencies
+	rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py
+
 	# Licence files are included into copyright file.
 	rm -fr htdocs/includes/phpexcel/license.txt
 	rm -f  htdocs/includes/tcpdf/LICENSE.TXT
@@ -118,4 +121,4 @@ clean:
 	dh $@
 
 binary-arch:
-	
\ No newline at end of file
+	
diff --git a/build/launchpad/README b/build/launchpad/README
index 2334b01f1d72ef34a314218ace7483b5c37e3838..0107c7d9537279148fedf7d2c9f4f3dbce0d8e64 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -28,6 +28,8 @@ a package onto LaunchPad
 - Edit file ~/.bashrc to add
 DEBFULLNAME="<Your name>" 
 DEBEMAIL="<Your email address>" 
+- Create a Bazaar directory
+    mkdir bzr
 
 If you want to build/test package locally:
 - Create a file ~/.pbuilderrc with content
@@ -36,29 +38,42 @@ If you want to build/test package locally:
     sudo pbuilder create [--distribution sid|squeeze]
 
 
-# Push/declare sources to Launchpad
+# Push/declare Dolibarr sources to Launchpad
 #----------------------------------
-
-- Create a series (https://launchpad.net/dolibarr/)
-    Call it 'dev', 'stable' or 'beta'
-    For dev: Configure Series branch - Link to series
-    For stable: Add file with *: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
-    For beta: Add file with *: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_3.2.*.tar.gz
-    mkdir bzr
+- From Launchpad project (https://launchpad.net/dolibarr), register a series: 
+    Call it 'trunk' or 'beta' or 'stable'
+    Use branch (dev):
+    ~eldy/dolibarr/develop
+    ~eldy/dolibarr/beta
+    ~eldy/dolibarr/stable
+    or 
+    Use URL pattern (beta or stable):
+    For stable: http://www.dolibarr.org/files/lastbuild/package_debian-ubuntu/dolibarr_x.z.*.tar.gz
+    For beta: http://www.dolibarr.org/files/stable/package_debian-ubuntu/dolibarr_x.y.*.tar.gz
+    
+- For Dev, you can also add link serie to GIT HEAD.
+- For beta and stable, you can init from command line
+	cd bzr/dolibarr-[beta|stable]
     bzr init
     bzr add
     bzr commit -m "Init"
+    bzr push lp:~yourlogin/dolibarr/[beta|stable]
 
-List of series created:
-https://launchpad.net/dolibarr/trunk
-https://launchpad.net/dolibarr/beta
-https://launchpad.net/dolibarr/stable
+- List of series are visible here: https://launchpad.net/dolibarr/+series
 
-# Init repository of sources into launchpad (when repository for sources does not exist)
+# To update Dolibarr into launchpad (when repository for sources already exists)
 #----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+    cd dolibarr-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    bzr push
 
-- Create debian directory and upload it onto bzr branch ~yourlogin/+junk/debian-[dev|stable]
-    mkdir bzr
+# Init debian dir repository into launchpad (when repository for sources does not exist)
+#----------------------------------
+-  Create debian directory and upload it onto bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
     cd bzr
     mkdir debian
     cd debian
@@ -67,27 +82,28 @@ https://launchpad.net/dolibarr/stable
     bzr add
     bzr commit -m "Init control files"
     bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]    (put here any branch name)
-  or download it from launchpad bazaar:
+- or download it from launchpad bazaar:
     cd bzr
     bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
-  
-  For sources, same with
-    bzr push lp:~yourlogin/dolibarr/[dev|beta|stable]
 
-- To update this debian directory, edit files into the bzr dir and run
-    bzr status
-    bzr commit -m "Description of change"
-    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
+# Get debian dir repository from launchpad (when repository for sources already exists)
+#----------------------------------
+	cd bzr
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
 
-# Get repository of sources from launchpad (when repository for sources already exists)
+# To update debian dir into launchpad (when repository for sources already exists)
 #----------------------------------
 	cd bzr
-	bzr branch lp:~yourlogin/+junk/debian-[dev|stable]
+	bzr branch lp:~yourlogin/+junk/debian-[dev|beta|stable]
+    cd debian-[dev|beta|stable]
+    bzr status
+	-- Update files here --
+    bzr commit -m "Description of change"
+    bzr push lp:~yourlogin/+junk/debian-[dev|beta|stable]
 
 
 # Define a recipe into launchpad (a rule to build packages into a PPA)
 #----------------------------------
-
 - Create a file dolibarr.recipe with content
     cd bzr
     vi dolibarr.recipe
@@ -119,11 +135,11 @@ https://code.launchpad.net/~eldy/+recipe/dolibarr-stable
 # To get/download package from PPA:
 #----------------------------------
 
-Add signing key of the Launchpad repository:
+- Add signing key of the Launchpad repository:
 > gpg --keyserver keyserver.ubuntu.com --recv-key A38BF8FD
 > sudo apt-key add ~/.gnupg/pubring.gpg
 
-Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
+- Add Dolibarr Launchpad repository to your system setup by adding the two lines to /etc/apt/sources.list
 For the development snapshot version: 
 deb http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-dev/ubuntu precise main 
@@ -134,12 +150,10 @@ For the stable version:
 deb http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 deb-src http://ppa.launchpad.net/yourlogin/dolibarr-stable/ubuntu precise main 
 
-Update your package cache:
+- Update your package cache:
 > apt-get update
 
-Install Dolibarr: 
+- Install Dolibarr: 
 > apt-get install dolibarr
 
-
-    
-    
+   
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 23d806bb72de5103944a0bb92f86babc51e65eb0..09952889c6f5d3fb5920e3f772c42571c1834574 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -658,6 +658,8 @@ if ($nboftargetok) {
             $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
             $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
+            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+            $ret=`$cmd`;
             
           
             print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index fad028cfbf6ff40192d7f38cac7730a1a60f480e..4847b0102ef165cc51341c47ecd535533b5d40cf 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -32,7 +32,7 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in /ChangeLog and /filefunc.inc.php
+- Update version/info in ChangeLog
 - Update version number with x.x.x in htdocs/filefunc.inc.php
 - Update version number with x.x.x in build/makepack-dolibarr.pl
 - Update version number with x.x.x in build/debian/changelog
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index e0197d82678018f55e30cfe0ceede7d69129b86b..23cd2f192097466af85c1f8172a1ee081419a2e6 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "3.4.0", "3.3.0", "3.2.1", "3.1.1" );
+return ( "3.4.0", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" );
 }
 
 sub script_dolibarr_category
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index aeec5a30fefc2674be04f7ce18ec8619c1b141e4..d578371b63594a30ba536587d11fd8a850640963 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -199,4 +199,4 @@ class modBanque extends DolibarrModules
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index e6bbefb7295367ac1e65bc830e6367c10e5b0cce..a628ee02d3e980de292cf2f9f8cc4f1dafbbd834 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -96,8 +96,17 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	/**
 	 * Return the parsed logfile path
 	 *
+<<<<<<< HEAD
 	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
 	 * @return	string
+=======
+<<<<<<< OURS
+	 * @return string
+=======
+	 * @param	string	$suffixinfilename	When output is a file, append this suffix into default log filename.
+	 * @return	string
+>>>>>>> THEIRS
+>>>>>>> refs/remotes/origin/3.3
 	 */
 	private function getFilename($suffixinfilename='')
 	{
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 4e93a5710b1c7b024b2cb65e10fad8eaf2a29a2c..685b35eb65cf29e055016542324ccf01c895d215 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -253,4 +253,4 @@ if (preg_match('/crypted:/i',$dolibarr_main_db_pass) || ! empty($dolibarr_main_d
 	else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5e9d958858e13ab011d2a401bbac3bc4e1e68cec..3b1d3c2f7bcf676bd2de00df1db0b4bd808342e9 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -45,8 +45,8 @@ ErrorModuleRequireDolibarrVersion= Erreur, ce module requiert une version %s ou
 ErrorDecimalLargerThanAreForbidden= Erreur, les précisions supérieures à <b>%s</b> ne sont pas supportées.
 DictionnarySetup= Dictionnaires
 Dictionnary= Dictionnaires
-ErrorReservedTypeSystemSystemAuto=
-ErrorCodeCantContainZero=
+ErrorReservedTypeSystemSystemAuto=Erreur, La valeur 'system' et 'systemauto' est réservée.
+ErrorCodeCantContainZero=Erruer, le code ne peut contenir la valeur 0
 DisableJavascript= Désactiver les fonctions Javascript et Ajax
 ConfirmAjax= Utiliser les popups de confirmation Ajax
 UseSearchToSelectCompany= Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
diff --git a/htdocs/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
index 36c8686a3c360f85db2fffe103283377c6b6734c..e41bab65bbd67eecd79455943b82b9eff4a26f8b 100644
--- a/htdocs/langs/fr_FR/externalsite.lang
+++ b/htdocs/langs/fr_FR/externalsite.lang
@@ -2,4 +2,4 @@
 CHARSET=UTF-8
 ExternalSiteSetup=Configuration du lien vers le site externe
 ExternalSiteURL=URL du site externe
-ExternalSiteModuleNotComplete=
\ No newline at end of file
+ExternalSiteModuleNotComplete=La configuration du module "Lien externe" est incomplète.
\ No newline at end of file
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index bc238882ecc68a3515bf381d5815792ff5056d5e..17880cd10af179e4255551d55f770cdd6c73d6dd 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -223,9 +223,9 @@ ExportDataset_invoice_1 = Afnemersfacturen en factuurregels
 ExportDataset_invoice_2 = Afnemersfacturen en -betalingen
 ProformaBill = Proforma factuur:
 Reduction = Vermindering
-ReductionShort = Minder
+ReductionShort = Korting
 Reductions = Verminderingen
-ReductionsShort = Minder
+ReductionsShort = Korting
 Discount = Korting
 Discounts = Kortingen
 ShowDiscount = Toon korting
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 0eaf6149f3b51eaf23e1adb0531135f201845077..d48ddfbdc29612e10d0bd6dff9b61fe44086ecf8 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -324,19 +324,5 @@ class DateLibTest extends PHPUnit_Framework_TestCase
         return $result;
     }
 
-    /**
-	 *	testDolGetFirstDay
-	 *
-	 *	@return	void
-     */
-    public function testDolGetFirstDay()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-    }
 }
-?>
\ No newline at end of file
+?>